4787 files changed, 18116 insertions, 114517 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..0a050de19
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+*~
+#*#
+.#*
+src/
+pkg/
+*.pkg.tar.*
+*.src.tar.*
+*.log*
+*lastsync
+kde-unstable/
+gnome-unstable/
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 5f43241ff..000000000
--- a/community-staging/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 62598 2012-01-22 12:14:47Z 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.36
-pkgrel=3
-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=('cc009c02fa0db088d074fef8b983e78a'
-         '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/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/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/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/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/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/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-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/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/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/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/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/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/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/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD
deleted file mode 100644
index 82f6480bd..000000000
--- a/community-staging/mtpaint/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62300 2012-01-19 07:19:24Z 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/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/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/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/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/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/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/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/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/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/xemacs/PKGBUILD b/community-staging/xemacs/PKGBUILD
deleted file mode 100644
index 0eebf8f46..000000000
--- a/community-staging/xemacs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 61591 2012-01-04 01:08:46Z stephane $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor : Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=xemacs
-pkgver=21.5.31
-pkgrel=4
-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/dbmail/PKGBUILD b/community-testing/dbmail/PKGBUILD
deleted file mode 100644
index e7fd4b3ad..000000000
--- a/community-testing/dbmail/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 62080 2012-01-15 19:14:39Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
-
-pkgname=dbmail
-pkgver=3.0.0_rc3
-pkgrel=1
-pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
-	     'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
-optdepends=('postgresql-libs: for PostgreSQL storage backend'
-	    'sqlite3: for SQLite storage backend'
-	    'libmysqlclient: for MySQL storage backend'
-	    'libldap: for LDAP authentication'
-	    'libsieve: for dbmail-sieve')
-url="http://www.dbmail.org"
-license=('GPL')
-options=('!libtool' 'zipman')
-backup=(etc/conf.d/dbmail)
-conflicts=('dbmail')
-provides=('dbmail')
-source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
-	dbmail.conf.d
-	dbmail.rc.d)
-md5sums=('52c3b9aad310efc90a6a2fff0552f73e'
-         'e7f72bc360decdb2475266391ad12329'
-         '099225611da20ec194c092ac9befc33c')
-
-build() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
-
-  [ -f Makefile ] || ./configure --prefix=/usr \
-	--with-mysql --with-pgsql --with-sqlite --with-ldap --with-sieve
-  make
-}
-
-package() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
-  make DESTDIR=$pkgdir install
-  (cd man && make && make install DESTDIR=$pkgdir)
-
-  mkdir $pkgdir/etc
-  install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
-  install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail
-  install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail
-  mkdir $pkgdir/usr/share/dbmail
-  cp -r sql/* $pkgdir/usr/share/dbmail/
-  cp dbmail.schema $pkgdir/usr/share/dbmail/
-}
diff --git a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch b/community-testing/dbmail/dbmail-2.2.10-pam-support.patch
deleted file mode 100644
index 805a7f609..000000000
--- a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -wbBur dbmail-2.2.10/configure.in dbmail-2.2.10.pam/configure.in
---- dbmail-2.2.10/configure.in	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/configure.in	2008-09-18 16:43:04.000000000 +0400
-@@ -78,6 +78,13 @@
- 
- AC_SUBST(CRYPTLIB)
- 
-+dnl Check for PAM
-+AC_SUBST(PAMLIBS,"")
-+AC_CHECK_HEADERS(security/pam_appl.h,
-+    [AC_CHECK_LIB(pam,pam_start,
-+	[AC_DEFINE(HAVE_PAM,1,[Define if you have PAN including devel headers])
-+	 PAMLIBS="-lpam"],,)])
-+
- AC_SUBST(MYSQLLIB)
- AC_SUBST(MYSQLALIB)
- AC_SUBST(MYSQLLTLIB)
-diff -wbBur dbmail-2.2.10/dbmail-user.c dbmail-2.2.10.pam/dbmail-user.c
---- dbmail-2.2.10/dbmail-user.c	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/dbmail-user.c	2008-09-18 16:43:04.000000000 +0400
-@@ -157,7 +157,7 @@
- 		"md5", 		"md5-raw",		"md5sum",	"md5sum-raw", 
- 		"md5-hash",	"md5-hash-raw",		"md5-digest",	"md5-digest-raw",
- 		"md5-base64",	"md5-base64-raw",	"md5base64",	"md5base64-raw",
--		"shadow", 	"", 	NULL
-+		"shadow", 	"pam",	"", 	NULL
- 	};
- 
- 	/* These must correspond to the easy text names. */
-@@ -166,7 +166,7 @@
- 		MD5_HASH, 	MD5_HASH_RAW,		MD5_DIGEST,	MD5_DIGEST_RAW,
- 		MD5_HASH,	MD5_HASH_RAW,		MD5_DIGEST,	MD5_DIGEST_RAW,
- 		MD5_BASE64,	MD5_BASE64_RAW,		MD5_BASE64,	MD5_BASE64_RAW,
--		SHADOW,		PLAINTEXT,	PWTYPE_NULL
-+		SHADOW,		PWTYPE_PAM,		PLAINTEXT,	PWTYPE_NULL
- 	};
- 
- 	memset(pw, 0, 50);
-@@ -251,6 +251,12 @@
- 				*enctype = "crypt";
- 			}
- 			break;
-+#ifdef HAVE_PAM
-+		case PWTYPE_PAM:
-+			null_strncpy(pw, passwd, 49);
-+			*enctype = "pam";
-+			break;
-+#endif			
- 		default:
- 			qerrorf("Error: password type not supported [%s].\n",
- 				passwdtype);
-diff -wbBur dbmail-2.2.10/dbmail-user.h dbmail-2.2.10.pam/dbmail-user.h
---- dbmail-2.2.10/dbmail-user.h	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/dbmail-user.h	2008-09-18 16:43:04.000000000 +0400
-@@ -34,7 +34,7 @@
- typedef enum {
- 	PLAINTEXT = 0, PLAINTEXT_RAW, CRYPT, CRYPT_RAW,
- 	MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW,
--	MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_NULL
-+	MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_PAM, PWTYPE_NULL
- } pwtype_t;
- 
- int mkpassword(const char * const user, const char * const passwd,
-diff -wbBur dbmail-2.2.10/modules/authsql.c dbmail-2.2.10.pam/modules/authsql.c
---- dbmail-2.2.10/modules/authsql.c	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/modules/authsql.c	2008-09-18 16:43:04.000000000 +0400
-@@ -27,6 +27,19 @@
- #include "dbmail.h"
- #define THIS_MODULE "auth"
- 
-+#ifdef HAVE_PAM
-+#include <security/pam_appl.h>
-+
-+#ifndef DEFAULT_DBMAIL_PAM_SERVICE
-+#define DEFAULT_DBMAIL_PAM_SERVICE "dbmail"
-+#endif
-+
-+#ifndef DEFAULT_DBMAIL_PAM_TTL
-+#define DEFAULT_DBMAIL_PAM_TTL 60
-+#endif
-+
-+#endif
-+
- extern db_param_t _db_params;
- #define DBPFX _db_params.pfx
- 
-@@ -49,17 +62,80 @@
-  */
- static int __auth_query(const char *thequery);
- 
-+#ifdef HAVE_PAM
-+
-+static char *pam_password = NULL;	/* Workaround for Solaris 2.6 brokenness */
-+static pam_handle_t *pamh = NULL;
-+static int pam_ttl = DEFAULT_DBMAIL_PAM_TTL;
-+static char *pam_service = DEFAULT_DBMAIL_PAM_SERVICE;
-+static time_t pamh_created = 0;
-+/*
-+ * A simple "conversation" function returning the supplied password.
-+ * Has a bit to much error control, but this is my first PAM application
-+ * so I'd rather check everything than make any mistakes. The function
-+ * expects a single converstation message of type PAM_PROMPT_ECHO_OFF.
-+ */
-+static int
-+password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-+{
-+    if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) {
-+    	TRACE(TRACE_ERROR, "Unexpected PAM converstaion '%d/%s'", msg[0]->msg_style, msg[0]->msg);
-+		return PAM_CONV_ERR;
-+    }
-+    if (!appdata_ptr) {
-+	/* Workaround for Solaris 2.6 where the PAM library is broken
-+	 * and does not pass appdata_ptr to the conversation routine
-+	 */
-+		appdata_ptr = pam_password;
-+    }
-+    if (!appdata_ptr) {
-+		TRACE(TRACE_ERROR, "ERROR: No password available to password_converstation!");
-+		return PAM_CONV_ERR;
-+    }
-+    *resp = calloc(num_msg, sizeof(struct pam_response));
-+    if (!*resp) {
-+		TRACE(TRACE_ERROR, "Out of memory!");
-+		return PAM_CONV_ERR;
-+    }
-+    (*resp)[0].resp = strdup((char *) appdata_ptr);
-+    (*resp)[0].resp_retcode = 0;
-+
-+    return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR);
-+}
-+
-+static struct pam_conv conv =
-+{
-+    &password_conversation,
-+    NULL
-+};
-+
-+#endif
-+
-+
- int auth_connect()
- {
- 	/* this function is only called after a connection has been made
- 	 * if, in the future this is not the case, db.h should export a 
- 	 * function that enables checking for the database connection
- 	 */
-+#ifdef HAVE_PAM
-+
-+#endif
- 	return 0;
- }
- 
- int auth_disconnect()
- {
-+#ifdef HAVE_PAM
-+	int retval=PAM_SUCCESS;
-+	if (pamh) {
-+		retval = pam_end(pamh, retval);
-+		if (retval != PAM_SUCCESS) {
-+	    	pamh = NULL;
-+	    TRACE(TRACE_ERROR, "failed to release PAM authenticator");
-+		}
-+    }
-+#endif
- 	return 0;
- }
- 
-@@ -458,7 +534,71 @@
- 		is_validated = (strncmp(md5str, query_result, 32) == 0) ? 1 : 0;
- 		g_free(md5str);
- 	}
-+#ifdef HAVE_PAM
-+	else if (strcasecmp(query_result, "pam") == 0) {
-+		int retval=0;
-+		TRACE(TRACE_DEBUG, "validating using pam for user [%s] pass:[%s]",real_username,password);
-+		conv.appdata_ptr = (char *) password;
-+		pam_password= password;
-+		if (pam_ttl == 0) {
-+	    	/* Create PAM connection */
-+	    	retval = pam_start(pam_service, real_username, &conv, &pamh);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_ERROR, "failed to create PAM authenticator");
-+				goto pam_error;
-+	    	}
-+		} else if (!pamh || (time(NULL) - pamh_created) >= pam_ttl || pamh_created > time(NULL)) {
-+	    	/* Close previous PAM connection */
-+	    	if (pamh) {
-+				retval = pam_end(pamh, retval);
-+				if (retval != PAM_SUCCESS) {
-+		    		TRACE(TRACE_WARNING, "failed to release PAM authenticator");
-+				}
-+				pamh = NULL;
-+	    	}
-+	    	/* Initialize persistent PAM connection */
-+	    	retval = pam_start(pam_service, "dbmail@", &conv, &pamh);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_ERROR, "failed to create PAM authenticator");
-+				goto pam_error;
-+	    	}
-+	    	pamh_created = time(NULL);
-+		}
-+		retval = PAM_SUCCESS;
-+		if (pam_ttl != 0) {
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_USER, real_username);
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_CONV, &conv);
-+		}
-+		if (retval == PAM_SUCCESS)
-+	    	retval = pam_authenticate(pamh, 0);
-+		if (retval == PAM_SUCCESS ) //&& !no_acct_mgmt
-+	    	retval = pam_acct_mgmt(pamh, 0);
-+		if (retval == PAM_SUCCESS) {
-+	    	is_validated=1;
-+		} else {
-+pam_error:
-+		    is_validated=0;
-+		}
-+		/* cleanup */
-+		retval = PAM_SUCCESS;
-+#ifdef PAM_AUTHTOK
-+		if (pam_ttl != 0) {
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_AUTHTOK, NULL);
-+		}
-+#endif
-+		if (pam_ttl == 0 || retval != PAM_SUCCESS) {
-+	    	retval = pam_end(pamh, retval);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_WARNING, "failed to release PAM authenticator\n");
-+	    	}
-+	    	pamh = NULL;
-+		}
- 
-+	}
-+#endif
- 	if (is_validated) {
- 		db_user_log_login(*user_idnr);
- 	} else {
-diff -wbBur dbmail-2.2.10/modules/Makefile.am dbmail-2.2.10.pam/modules/Makefile.am
---- dbmail-2.2.10/modules/Makefile.am	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/modules/Makefile.am	2008-09-18 16:44:53.000000000 +0400
-@@ -60,7 +60,7 @@
- 
- # This one is always built.
- libauth_sql_la_SOURCES = authsql.c
--libauth_sql_la_LIBADD = @CRYPTLIB@
-+libauth_sql_la_LIBADD = @CRYPTLIB@ @PAMLIBS@
- 
- if LDAP
- libauth_ldap_la_SOURCES = authldap.c
diff --git a/community-testing/dbmail/dbmail.conf.d b/community-testing/dbmail/dbmail.conf.d
deleted file mode 100644
index 73309a4a2..000000000
--- a/community-testing/dbmail/dbmail.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Parameters to be passed to dbmail
-#
-#
-# Select the service you want started with dbmail
-#
-# Available options :
-# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved
-#
-DBMAIL_DAEMONS="dbmail-imapd"
diff --git a/community-testing/dbmail/dbmail.rc.d b/community-testing/dbmail/dbmail.rc.d
deleted file mode 100644
index 92c34e5d2..000000000
--- a/community-testing/dbmail/dbmail.rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-	for daemon in $DBMAIL_DAEMONS; do
-	    stat_busy "Starting DbMail ${daemon}"
-	    /usr/sbin/${daemon}
-	    if [ $? -gt 0 ]; then
-		stat_fail
-	    else
-		stat_done
-	    fi
-	done
-	add_daemon dbmail
-	;;
-    stop)
-	for daemon in $DBMAIL_DAEMONS; do
-	    stat_busy "Stopping DbMail ${daemon}"
-	    pid=$(cat /var/run/${daemon}.pid)
-	    kill $pid
-	    sleep 4
-	    stat_done
-	done
-	rm_daemon dbmail
-	;;
-    restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-
-exit 0
diff --git a/community-testing/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/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD
deleted file mode 100644
index d81e08908..000000000
--- a/community-testing/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 61731 2012-01-07 05:11:14Z ebelanger $
-# 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=3
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
-	osg-xine-1.2.patch)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('c43a25d023e635c3566b2083d8e6d956'
-         'b05a486fdc2aaf06b29efb5e0714672e')
-
-build() {
-  cd OpenSceneGraph-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
-  patch -p1 <$srcdir/osg-xine-1.2.patch
-  make
-}
-
-package() {
-  cd OpenSceneGraph-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-testing/openscenegraph/osg-xine-1.2.patch b/community-testing/openscenegraph/osg-xine-1.2.patch
deleted file mode 100644
index c73b588dc..000000000
--- a/community-testing/openscenegraph/osg-xine-1.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c	2009-11-20 14:46:20.000000000 +0300
-+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c	2012-01-05 02:15:38.000000000 +0400
-@@ -2769,8 +2769,8 @@
- 	clear(rgb_class, sizeof(rgbout_class_t));
- 
- 	rgb_class->driver_class.open_plugin     = open_plugin;
--	rgb_class->driver_class.get_identifier  = get_identifier;
--	rgb_class->driver_class.get_description = get_description;
-+	rgb_class->driver_class.identifier  = get_identifier(NULL);
-+	rgb_class->driver_class.description = get_description(NULL);
- 	rgb_class->driver_class.dispose         = dispose_class;
- 
- 	return(rgb_class);
diff --git a/community-testing/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/pysfml/PKGBUILD b/community-testing/pysfml/PKGBUILD
deleted file mode 100644
index 204197c1b..000000000
--- a/community-testing/pysfml/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 29367 2010-10-13 15:58:47Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: scj <scj(at)archlinux(dot)us>
-
-pkgname=('python-pysfml' 'python2-pysfml')
-pkgbase=python-pysfml
-pkgver=1.6
-pkgrel=2
-pkgdesc="Python bindings for the SFML library"
-arch=('i686' 'x86_64')
-url="http://www.sfml-dev.org"
-makedepends=('sfml' 'python' 'python2')
-license=('zlib')
-depends=()
-replaces=('pysfml')
-source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip)
-md5sums=('9acaf793ae9a498a51f7f6fc74307b32')
-
-build() {
-  cd "${srcdir}/SFML-${pkgver}/python"
-}
-
-package_python-pysfml() {
-  depends=('sfml' 'python')
-
-  cd "${srcdir}/SFML-${pkgver}/python"
-
-  python3 setup.py install --root=${pkgdir}
-}
-
-package_python2-pysfml() {
-  depends=('sfml' 'python2')
-
-  cd "${srcdir}/SFML-${pkgver}/python"
-
-  python2 setup.py install --root=${pkgdir}
-}
-
-# vim:set ts=2 sw=2 et:
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/PKGBUILD b/community-testing/speed-dreams/PKGBUILD
deleted file mode 100644
index 757a901fe..000000000
--- a/community-testing/speed-dreams/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 54504 2011-08-19 10:27:23Z 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.0a3
-_pkgver=2.0.0-a3-r3412
-pkgrel=1
-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')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z"
-        "${pkgname}.desktop")
-md5sums=('659837e8866c59c85279c31fcaba4144'
-         'bd5c81bac696ec53628ba42684ef8369')
-
-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
-
-  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}/"
-
-  mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}"
-  rm doc/man/speed-dreams.es.6
-  cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/speed-dreams/speed-dreams.desktop b/community-testing/speed-dreams/speed-dreams.desktop
deleted file mode 100644
index 8c86d85cc..000000000
--- a/community-testing/speed-dreams/speed-dreams.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Speed Dreams
-Comment=The Open Racing Car Simulator Fork
-Exec=speed-dreams
-Icon=speed-dreams.svg
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
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/xemacs/PKGBUILD b/community-testing/xemacs/PKGBUILD
deleted file mode 100644
index 2787048b1..000000000
--- a/community-testing/xemacs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 61886 2012-01-09 18:50:38Z stephane $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor : Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=xemacs
-pkgver=21.5.31
-pkgrel=4
-pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
-arch=('i686' 'x86_64')
-url="http://www.xemacs.org/"
-license=('GPL')
-depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
-optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
-            'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
-makedepends=('xbitmaps')
-install=xemacs.install
-source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz
-        xemacs.desktop
-        xemacs-21.5.29-optimization-bug.patch)
-md5sums=('0185fe905d0b8d8d094d9b60cf262d4a'
-         'a4d3d5c0aa2c7ce7bec491f809ca3694'
-         'eb061b10ea3bbe1026df5326ae1618e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
-# (and possibly other arches). See
-# http://tracker.xemacs.org/XEmacs/its/issue354
-# for the upstream bug report.
-  patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch
- 	
-  ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
-      --without-postgresql --with-athena=xaw \
-      --enable-database=berkdb --without-ldap \
-      --enable-menubars=lucid --enable-scrollbars=lucid \
-      --enable-widgets=athena --enable-dialogs=athena \
-      --enable-external-widget \
-      --with-jpeg --with-png --with-tiff \
-      --with-ncurses --with-pop --with-xfs --disable-sound \
-      --infodir=/usr/share/info \
-      --with-mule \
-      --mandir=/usr/share/man/man1
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el
-
-  rm "${pkgdir}"/usr/bin/{b2m,ctags,etags}
-  rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1}
-
-  # fix  FS#7927
-  install -d -m755 "${pkgdir}/usr/share/pixmaps"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm"
-
-  # correct permissions
-  chown -R root:root "${pkgdir}"
-
-  rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch
deleted file mode 100644
index 32a1a02c2..000000000
--- a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Work around a GCC optimization bug as described in
-http://tracker.xemacs.org/XEmacs/its/issue354
-
---- src/dumper.c.~1~	2008-01-26 09:54:11.000000000 +0100
-+++ src/dumper.c	2008-05-03 10:17:03.000000000 +0200
-@@ -2584,7 +2584,7 @@
- #endif /* !WIN32_NATIVE */
- 
- 
--static int
-+int
- pdump_file_try (Wexttext *exe_path)
- {
-   Wexttext *w = exe_path + wext_strlen (exe_path);
diff --git a/community-testing/xemacs/xemacs.desktop b/community-testing/xemacs/xemacs.desktop
deleted file mode 100644
index 257c56947..000000000
--- a/community-testing/xemacs/xemacs.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Name=XEmacs Text Editor
-Name[bg]=редактор XEmacs
-Name[ca]=Editor XEmacs
-Name[cs]=Editor XEmacs
-Name[da]=XEmacs tekstredigerer
-Name[de]=XEmacs Texteditor
-Name[eo]=La redaktilo XEmakso
-Name[es]=Emacs para X
-Name[et]=Emacs X'i kasutajaliidesega
-Name[fi]=XEmacs editori
-Name[fr]=Éditeur XEmacs
-Name[hu]=XEmacs szövegszerkesztő
-Name[is]=XEmacs-ritill
-Name[it]=Emacs per X
-Name[ja]=XEmacs テキスト・エディター
-Name[mk]=Софистицираниот XEmacs уредувач
-Name[no]=XEmacs-tekstredigerer
-Name[pt]=Editor XEmacs
-Name[ro]=Editorul XEmacs
-Name[ru]=Редактор XEmacs
-Name[sk]=Editor XEmacs
-Name[sl]=Urejevalnik XEmacs
-Name[uk]=Редактор XEmacs
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=xemacs %f
-Icon=/usr/share/pixmaps/xemacs-icon.xpm
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-Encoding=UTF-8
-StartupWMClass=Emacs
diff --git a/community-testing/xemacs/xemacs.install b/community-testing/xemacs/xemacs.install
deleted file mode 100644
index a04ee187f..000000000
--- a/community-testing/xemacs/xemacs.install
+++ /dev/null
@@ -1,35 +0,0 @@
-infodir=usr/share/info
-filelist=(beta.info.gz custom.info.gz 
-	  emodules.info.gz external-widget.info.gz 
-	  internals.info-1.gz internals.info-2.gz 
-	  internals.info-3.gz internals.info-4.gz 
-	  internals.info-5.gz internals.info.gz 
-	  lispref.info-1.gz lispref.info-10.gz 
-	  lispref.info-2.gz lispref.info-3.gz 
-	  lispref.info-4.gz lispref.info-5.gz 
-	  lispref.info-6.gz lispref.info-7.gz 
-	  lispref.info-8.gz lispref.info-9.gz 
-	  lispref.info.gz new-users-guide.info.gz 
-	  term.info.gz termcap.info.gz 
-	  xemacs-faq.info-1.gz xemacs-faq.info-2.gz 
-	  xemacs-faq.info.gz xemacs.info-1.gz 
-	  xemacs.info-2.gz xemacs.info-3.gz 
-	  xemacs.info-4.gz xemacs.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-  update-desktop-database -q
-}
diff --git a/community-testing/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/6tunnel/PKGBUILD b/community/6tunnel/PKGBUILD
index a873e8817..a3c169763 100644
--- a/community/6tunnel/PKGBUILD
+++ b/community/6tunnel/PKGBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Tunnels IPv6 connections for IPv4-only applications"
 url="http://toxygen.net/6tunnel/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(glibc)
 source=(http://toxygen.net/6tunnel/$pkgname-$pkgver.tar.gz)
 md5sums=('74e02d4f0704b3083a01feda66033449')
diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD
index 06fd6be71..aa2dbb008 100644
--- a/community/9base/PKGBUILD
+++ b/community/9base/PKGBUILD
@@ -13,7 +13,7 @@ source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz 9 plan9.sh)
 depends=(sh)
 conflicts=('plan9port' '9rc-devel')
 provides=('plan9')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 
 build()
diff --git a/community/adesklets/PKGBUILD b/community/adesklets/PKGBUILD
index 607ac3847..419b35387 100644
--- a/community/adesklets/PKGBUILD
+++ b/community/adesklets/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=adesklets
 pkgver=0.6.1
 pkgrel=12
 pkgdesc="An imlib2-based system to have interactive 'desklets'."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://adesklets.sourceforge.net/"
 license=('GPL2')
 depends=('imlib2' 'fontconfig' 'python2' 'perl' 'ttf-bitstream-vera' 'libx11')
diff --git a/community/adns-python/PKGBUILD b/community/adns-python/PKGBUILD
index 30dec848a..c6c393de7 100644
--- a/community/adns-python/PKGBUILD
+++ b/community/adns-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=adns-python
 pkgver=1.2.1
 pkgrel=4
 pkgdesc="python bindings for adns"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/adns-python/"
 depends=('adns' 'python2')
 makedepends=()
diff --git a/community/adns/PKGBUILD b/community/adns/PKGBUILD
index 3165436a8..4e2dacb81 100644
--- a/community/adns/PKGBUILD
+++ b/community/adns/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=adns
 pkgver=1.4
 pkgrel=2
 pkgdesc="adns is an asyncronous replacement resolver library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~ian/adns/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/agave/PKGBUILD b/community/agave/PKGBUILD
index 219e5150a..3998f6d51 100644
--- a/community/agave/PKGBUILD
+++ b/community/agave/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=agave
 pkgver=0.4.7
 pkgrel=2
 pkgdesc="An colorscheme designer for the Gnome desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://home.gna.org/colorscheme"
 license=('GPL')
 depends=('gtkmm' 'libgnomeui' 'libglademm' 'gconfmm>=2.18.1' 'hicolor-icon-theme')
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD
index 7a50506a2..4ac0172da 100644
--- a/community/agg/PKGBUILD
+++ b/community/agg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=agg
 pkgver=2.5
 pkgrel=4
 pkgdesc="A High Quality Rendering Engine for C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.antigrain.com/"
 license=('GPL')
 depends=('gcc-libs' 'sdl' 'freetype2')
diff --git a/community/agsync/PKGBUILD b/community/agsync/PKGBUILD
index 9278d80fb..318010c22 100644
--- a/community/agsync/PKGBUILD
+++ b/community/agsync/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.2_pre
 _xpkgver=${pkgver/_/-}
 pkgrel=3
 pkgdesc="AvantGo sync plugin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://duskwood.lownewulf.com/"
 license=("GPL")
 depends=('synce-librapi')
diff --git a/community/aide/PKGBUILD b/community/aide/PKGBUILD
index 684526ddc..d7961b649 100644
--- a/community/aide/PKGBUILD
+++ b/community/aide/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=aide
 pkgver=0.15.1
 pkgrel=3
 pkgdesc='A file integrity checker and intrusion detection program.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.tut.fi/~rammer/aide.html"
 license=('GPL')
 makedepends=('mhash' 'elfutils')
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index 27f257e5c..4bb49cd21 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -7,8 +7,8 @@
 pkgbase=aircrack-ng
 pkgname=(aircrack-ng aircrack-ng-scripts)
 pkgver=1.1
-pkgrel=7
-arch=('i686' 'x86_64')
+pkgrel=7.1
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
 source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/alltray/PKGBUILD b/community/alltray/PKGBUILD
index 602aa9e00..b61827550 100644
--- a/community/alltray/PKGBUILD
+++ b/community/alltray/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.7.5dev
 pkgrel=1
 pkgdesc="Drops any app in the tray."
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alltray.trausch.us/"
 depends=('libxpm' 'libgtop' 'libwnck')
 options=('!libtool')
diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD
index 2426a5ec7..a7aac2f8b 100644
--- a/community/alure/PKGBUILD
+++ b/community/alure/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=alure
 pkgver=1.2
 pkgrel=1
 pkgdesc='Utility library to help manage common tasks with OpenAL applications.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kcat.strangesoft.net/alure.html'
 license=('MIT')
 depends=('openal')
diff --git a/community/amidi-plug/PKGBUILD b/community/amidi-plug/PKGBUILD
index ba29a076c..249bf8494 100644
--- a/community/amidi-plug/PKGBUILD
+++ b/community/amidi-plug/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=amidi-plug
 pkgver=0.7
 pkgrel=5
 pkgdesc="A MIDI input plugin for XMMS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.develia.org/projects.php?l=2&f=1&p=amidiplug"
 license=('GPL2')
 depends=('xmms' 'fluidsynth')
diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD
index c96ccf33c..8159f68f7 100644
--- a/community/amsn/PKGBUILD
+++ b/community/amsn/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=amsn
 pkgver=0.98.4
 pkgrel=1
 pkgdesc="MSN client written in Tcl/Tk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://amsn.sourceforge.net/"
 license=('GPL2')
 depends=('tk' 'tls')
diff --git a/community/antiword/PKGBUILD b/community/antiword/PKGBUILD
index 3d5c45644..260633c73 100644
--- a/community/antiword/PKGBUILD
+++ b/community/antiword/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=antiword
 pkgver=0.37
 pkgrel=3
 pkgdesc="A free MS Word reader for Linux and RISC OS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.winfield.demon.nl/"
 license=('GPL')
 depends=('bash')
diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD
index 47d550208..41643d5a1 100644
--- a/community/anyfs-tools/PKGBUILD
+++ b/community/anyfs-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=anyfs-tools
 pkgver=0.85.1c
 pkgrel=1
 pkgdesc="unix-way toolset for recovering and converting filesystems"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://anyfs-tools.sourceforge.net/"
 license=('GPL')
 depends=(bzip2 e2fsprogs libmpeg2 xfsprogs fuse)
diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 0e50f3466..1cec8981d 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=apcupsd
 pkgver=3.14.10
 pkgrel=1
 pkgdesc="power mangement and controlling most of APC's UPS models"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.apcupsd.org"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/community/apg/PKGBUILD b/community/apg/PKGBUILD
index 9af58f37d..707c5a6af 100644
--- a/community/apg/PKGBUILD
+++ b/community/apg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=apg
 pkgver=2.2.3
 pkgrel=2
 pkgdesc="Automated Password Generator."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.adel.nursat.kz/apg/index.shtml"
 license=('custom')
 depends=('glibc')
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index 2b1e7cc8a..b3e7346c6 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=apvlv
 pkgver=0.1.2
 pkgrel=2
 pkgdesc="A PDF Viewer which behaves like Vim"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://naihe2010.github.com/apvlv/"
 license=('GPL')
 depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre')
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index 34307fd4b..f05bd1f20 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.0.21
 _dnrel=91
 pkgrel=1
 pkgdesc="A library for online banking and financial applications"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 options=('!libtool')
 url="http://www.aquamaniac.de/aqbanking"
 license=('GPL')
diff --git a/community/arch/PKGBUILD b/community/arch/PKGBUILD
index 2be3a270a..de474a313 100644
--- a/community/arch/PKGBUILD
+++ b/community/arch/PKGBUILD
@@ -5,7 +5,7 @@ pkgname='arch'
 pkgver=1.3.5
 pkgrel=8
 pkgdesc="a modern and remarkable revision control system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://regexps.srparish.net/www/#Gnu-arch"
 depends=('zlib' 'expat' 'krb5')
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index ff8e20911..2e4586bce 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aria2
 pkgver=1.14.1
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://aria2.sourceforge.net/'
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD
index cc59a56fd..d96fa671c 100644
--- a/community/ario/PKGBUILD
+++ b/community/ario/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ario
 pkgver=1.5.1
 pkgrel=1
 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD
index c3606bde1..a6ab55b6b 100644
--- a/community/armagetronad/PKGBUILD
+++ b/community/armagetronad/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=armagetronad
 pkgver=0.2.8.3.1
 pkgrel=2
 pkgdesc='A Tron Clone in 3D.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://armagetronad.net/'
 license=('GPL')
 depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl')
diff --git a/community/arp-scan/PKGBUILD b/community/arp-scan/PKGBUILD
index 6987f26d9..e4878c4fe 100644
--- a/community/arp-scan/PKGBUILD
+++ b/community/arp-scan/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=arp-scan
 pkgver=1.8.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A tool that uses ARP to discover and fingerprint IP hosts on the local network"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://www.nta-monitor.com/tools/arp-scan/"
 license=('GPL')
 depends=('libpcap' 'perl-libwww')
diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD
index 0f909d106..5b92af19f 100644
--- a/community/arpack/PKGBUILD
+++ b/community/arpack/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=arpack
 pkgver=2.1
 pkgrel=4
 pkgdesc="A collection of Fortran77 subroutines designed to solve large scale eigenvalue problems"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.caam.rice.edu/software/ARPACK"
 license=('custom:BSD')
 depends=('glibc' 'gcc-fortran')
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index fd01fb64e..ae9acd0c2 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=arpwatch
 pkgver=2.1a15
 pkgrel=7
 pkgdesc="arpwatch and arpsnmp network monitoring tools"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="ftp://ftp.ee.lbl.gov/"
 license=("GPL")
 depends=(libpcap)
diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index 243e6aafe..fc86b799a 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ascii
 pkgver=3.11
 pkgrel=1
 pkgdesc="Utility for conversion between various byte representations and the ASCII character table"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.catb.org/~esr/ascii"
 license=('BSD')
 source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz")
diff --git a/community/asciijump/PKGBUILD b/community/asciijump/PKGBUILD
index 3be130f09..137c3dc92 100644
--- a/community/asciijump/PKGBUILD
+++ b/community/asciijump/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=asciijump
 pkgver=1.0.2beta
 pkgrel=5
 pkgdesc="Ski jumping in ASCII"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://asciijump.prv.pl/"
 license=('GPL')
 depends=('slang' 'ctags')
diff --git a/community/aspell-ca/PKGBUILD b/community/aspell-ca/PKGBUILD
index 9a5686ef2..70fafa27d 100644
--- a/community/aspell-ca/PKGBUILD
+++ b/community/aspell-ca/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=aspell-ca
 pkgver=2.1.5
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Catalan dictionary for aspell"
 depends=('aspell')
 url="http://aspell.net/"
diff --git a/community/aspell-cs/PKGBUILD b/community/aspell-cs/PKGBUILD
index fa8a54422..e9aef2380 100644
--- a/community/aspell-cs/PKGBUILD
+++ b/community/aspell-cs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=aspell-cs
 pkgver=20040614
 pkgrel=5
 pkgdesc="Czech dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL')
 depends=('aspell')
diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD
index 3b0df74f5..b46e38cd8 100644
--- a/community/aspell-pl/PKGBUILD
+++ b/community/aspell-pl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-pl
 pkgver=20111117
 pkgrel=1
 pkgdesc="Polish dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sjp.pl/slownik/en/"
 license=('GPL' 'LGPL' 'MPL')
 depends=('aspell')
diff --git a/community/aspell-uk/PKGBUILD b/community/aspell-uk/PKGBUILD
index a41ececd8..08a4999bd 100644
--- a/community/aspell-uk/PKGBUILD
+++ b/community/aspell-uk/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.6.5
 _ftpver=1.4.0
 pkgrel=3
 pkgdesc="Ukrainian dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ispell-uk.sourceforge.net/"
 license=('GPL' 'LGPL' 'MPL')
 depends=('aspell')
diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD
index 9c3e7849a..93d1f9ecd 100644
--- a/community/astromenace/PKGBUILD
+++ b/community/astromenace/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=astromenace
 pkgver=1.2.0
 pkgrel=4
 pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.viewizard.com/astromenace/index_linux.php"
 license=('GPL3')
 depends=('sdl' 'freealut' 'libjpeg' 'libvorbis')
diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD
index 231621751..e7a64294a 100644
--- a/community/astyle/PKGBUILD
+++ b/community/astyle/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=astyle
 pkgver=2.02
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A Free, Fast and Small Automatic Formatter for C, C++, C#, and Java Source Code"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/astyle/"
 license=('LGPL')
 depends=('gcc-libs')
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index 3cc5b8da4..5dfb0c657 100644
--- a/community/atanks/PKGBUILD
+++ b/community/atanks/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Atomic Tanks"
 url="http://atanks.sourceforge.net"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('sed')
 depends=('allegro4>=4.4.0.1' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz")
diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD
index b265f2361..909c10bd3 100644
--- a/community/atop/PKGBUILD
+++ b/community/atop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=atop
 pkgver=1.26
 pkgrel=2
 pkgdesc="A system and process level monitor."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.atoptool.nl/"
 license=('GPL')
 depends=('ncurses' 'sh' 'zlib')
diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD
index 1572774dc..3b0e855f3 100644
--- a/community/audex/PKGBUILD
+++ b/community/audex/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=audex
 pkgver=0.74b1
 pkgrel=3
 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php?content=77125"
 license=('GPL')
 depends=('kdemultimedia-kioslave' 'cdparanoia')
diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD
index 6cc5ed1d3..f670fd7dc 100644
--- a/community/augeas/PKGBUILD
+++ b/community/augeas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=augeas
 pkgver=0.10.0
 pkgrel=2
 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://augeas.net"
 license=('LGPL')
 depends=('libxml2' 'gcc-libs')
diff --git a/community/aumix/PKGBUILD b/community/aumix/PKGBUILD
index abf1783f6..d7a2d697d 100644
--- a/community/aumix/PKGBUILD
+++ b/community/aumix/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aumix
 pkgver=2.9.1
 pkgrel=2
 pkgdesc="A color text mode sound mixer with GPM support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=()
 makedepends=('gtk2' 'gpm' 'ncurses')
diff --git a/community/autocutsel/PKGBUILD b/community/autocutsel/PKGBUILD
index 452350efe..9d14f623f 100644
--- a/community/autocutsel/PKGBUILD
+++ b/community/autocutsel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=autocutsel
 pkgver=0.9.0
 pkgrel=6
 pkgdesc="synchronizes the two copy/paste buffers mainly used by X applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw')
 source=(http://lepton.fr/tools/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('ba4a6f632cb4815ae4e5c3027c24cfc5')
diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD
index 9c09a332e..618933cfa 100644
--- a/community/autofs/PKGBUILD
+++ b/community/autofs/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=autofs
 pkgver=5.0.6
 pkgrel=2
 pkgdesc='A kernel-based automounter for Linux.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://freshmeat.net/projects/autofs'
 license=('GPL2')
 depends=('libldap' 'libxml2' 'krb5')
diff --git a/community/autossh/PKGBUILD b/community/autossh/PKGBUILD
index dae94ca80..dc3634f58 100644
--- a/community/autossh/PKGBUILD
+++ b/community/autossh/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=autossh
 pkgver=1.4c
 pkgrel=1
 pkgdesc="Automatically restart SSH sessions and tunnels"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.harding.motd.ca/autossh/"
 license=('custom')
 depends=('openssh')
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index e38f7fb94..01a3fb809 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=avifile
 pkgver=0.7.45
 pkgrel=8
 pkgdesc="A library that allows you to read and write compressed AVI files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg'
          'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv')
 makedepends=('lame' 'qt3' 'v4l-utils' 'chrpath')
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index ee235f8a7..6aee519ea 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=avrdude
 pkgver=5.11.1
 pkgrel=1
 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/avrdude/"
 license=('GPL')
 depends=('libusb-compat' 'readline')
diff --git a/community/axel/PKGBUILD b/community/axel/PKGBUILD
index eddad131c..14dbd8691 100644
--- a/community/axel/PKGBUILD
+++ b/community/axel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=axel
 pkgver=2.4
 pkgrel=2
 pkgdesc="Download accelerator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://axel.alioth.debian.org/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD
index 2c86520c9..669385f72 100644
--- a/community/bacula/PKGBUILD
+++ b/community/bacula/PKGBUILD
@@ -7,7 +7,7 @@ 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")
+arch=(mips64el)
 url="http://www.${pkgname}.org"
 license=("GPL")
 depends=("libmysqlclient")
diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD
index 8777c8f40..9bc637420 100644
--- a/community/balsa/PKGBUILD
+++ b/community/balsa/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=balsa
 pkgver=2.4.11
 pkgrel=1
 pkgdesc="An e-mail client for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://pawsa.fedorapeople.org/balsa/'
 depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils')
diff --git a/community/barrage/PKGBUILD b/community/barrage/PKGBUILD
index 365ca015a..f0b9f4fc1 100644
--- a/community/barrage/PKGBUILD
+++ b/community/barrage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=barrage
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="A violent point-and-click shooting game with nice effects"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lgames.sourceforge.net/index.php?project=Barrage"
 license=('GPL')
 depends=('hicolor-icon-theme' 'sdl_mixer')
diff --git a/community/bbpager/PKGBUILD b/community/bbpager/PKGBUILD
index fa059de30..9440101d6 100644
--- a/community/bbpager/PKGBUILD
+++ b/community/bbpager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bbpager
 pkgver=0.4.7
 pkgrel=3
 pkgdesc="A dockable pager for Blackbox and other window managers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://bbtools.sourceforge.net/download.php?file=6"
 license=("GPL")
 depends=('gcc-libs' 'libxft' 'libxext')
diff --git a/community/bbrun/PKGBUILD b/community/bbrun/PKGBUILD
index 728a36c9c..24df597dd 100644
--- a/community/bbrun/PKGBUILD
+++ b/community/bbrun/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bbrun
 pkgver=1.6
 pkgrel=3
 pkgdesc="A run - component for blackbox window manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.darkops.net/bbrun/"
 license=('GPL')
 depends=('gtk2' 'libxpm')
diff --git a/community/bchunk/PKGBUILD b/community/bchunk/PKGBUILD
index c6d286b29..61493b795 100644
--- a/community/bchunk/PKGBUILD
+++ b/community/bchunk/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.0
 pkgrel=2
 pkgdesc="A Tool to Convert *.raw *.bin files to an ISO file"
 url="http://hes.iki.fi/bchunk/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 source=(http://hes.iki.fi/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/community/beaver/PKGBUILD b/community/beaver/PKGBUILD
index 61c35656b..b0d67aaad 100644
--- a/community/beaver/PKGBUILD
+++ b/community/beaver/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=beaver
 pkgver=0.4.1
 pkgrel=1
 pkgdesc='Beaver is an Early AdVanced EditoR.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://beaver-editor.sourceforge.net/'
 license=('GPL2')
 depends=('gtk2>=2.0.0' 'hicolor-icon-theme')
diff --git a/community/beye/PKGBUILD b/community/beye/PKGBUILD
index 80ec17860..5d5187d25 100644
--- a/community/beye/PKGBUILD
+++ b/community/beye/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=6.1.0
 _lver=610
 pkgrel=2
 pkgdesc="Binary viewer"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('slang' 'gpm')
 replaces=('biew')
diff --git a/community/bin2iso/PKGBUILD b/community/bin2iso/PKGBUILD
index 8c2e2b7a9..cba38728a 100644
--- a/community/bin2iso/PKGBUILD
+++ b/community/bin2iso/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.9b
 _dlver=${pkgver/./}
 pkgrel=2
 pkgdesc="bin2iso converts RAW format (.bin/.cue) files to ISO/WAV format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://users.eastlink.ca/~doiron/bin2iso/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/bind-geodns/PKGBUILD b/community/bind-geodns/PKGBUILD
index 176e1b84e..d2899c826 100644
--- a/community/bind-geodns/PKGBUILD
+++ b/community/bind-geodns/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=9.4.1
 _pkgver=9.4.1-P1
 pkgrel=4
 pkgdesc="bind named server with geoip patch can return ip depending on requester location"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.caraytech.com/geodns/"
 license=('custom:ISC')
 backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named etc/rndc.key)
diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD
index cd2f9c7e8..d052033fd 100644
--- a/community/binutils-avr/PKGBUILD
+++ b/community/binutils-avr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=binutils-avr
 pkgver=2.22
 pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 depends=('glibc>=2.12-5' 'zlib')
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 8bab0f4d1..07961fe67 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.6
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://bird.network.cz/'
 license=('GPL2')
 depends=('readline' 'ncurses')
diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD
index c8c641216..036a2ffff 100644
--- a/community/blackbox/PKGBUILD
+++ b/community/blackbox/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.70.1
 pkgrel=10
 pkgdesc="A window manager for X11"
 url="http://blackboxwm.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
 license=('MIT')
 options=('!libtool')
diff --git a/community/bless/PKGBUILD b/community/bless/PKGBUILD
index e00e6d3c1..87a3034e9 100644
--- a/community/bless/PKGBUILD
+++ b/community/bless/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bless
 pkgver=0.6.0
 pkgrel=2
 pkgdesc="A high-quality, full-featured hex editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://home.gna.org/bless/"
 license=('GPL')
 depends=('gtk-sharp-2>=2.8')
diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD
index 1bcd9e068..05c7119e4 100644
--- a/community/blobby2/PKGBUILD
+++ b/community/blobby2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=blobby2
 pkgver=0.9c
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgrel=1
 pkgdesc="A beach ball game with blobs of goo"
 url="http://sourceforge.net/projects/blobby/"
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD
index efecf86b0..7ef622c93 100644
--- a/community/blueman/PKGBUILD
+++ b/community/blueman/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=blueman
 pkgver=1.23
 pkgrel=2
 pkgdesc="GTK+ bluetooth manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://blueman-project.org"
 depends=('python-notify' 'bluez' 'dbus-python' 'gtk2' 'pygobject' 'startup-notification'
diff --git a/community/bomberclone/PKGBUILD b/community/bomberclone/PKGBUILD
index 749ca0a78..21d94a1da 100644
--- a/community/bomberclone/PKGBUILD
+++ b/community/bomberclone/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=bomberclone
 pkgver=0.11.9
 pkgrel=1
 pkgdesc='A clone of the game AtomicBomberMan.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bomberclone.de/"
 license=('GPL')
 depends=('sdl_mixer' 'sdl_image')
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD
index 8a32091ac..f787b68ee 100644
--- a/community/bonnie++/PKGBUILD
+++ b/community/bonnie++/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bonnie++
 pkgver=1.03e
 pkgrel=5
 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.coker.com.au/bonnie++/"
 license=('GPL')
 depends=('perl')
diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD
index e0c5a3db5..64d037453 100644
--- a/community/box2d/PKGBUILD
+++ b/community/box2d/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="2D rigid body simulation library for games"
 url="http://www.box2d.org/"
 license=('zlib')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #depends=('freeglut')
 makedepends=('cmake')
 optdepends=()
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD
index 88b330f80..c625183c3 100644
--- a/community/bsd-games/PKGBUILD
+++ b/community/bsd-games/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.17
 pkgrel=10
 pkgdesc="A linux port for a collection of BSD command line games."
 url="ftp://ftp.ibiblio.org/pub/Linux/games/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 install=$pkgname.install
 license=('BSD')
 depends=(gcc-libs words sh)
diff --git a/community/bsdiff/PKGBUILD b/community/bsdiff/PKGBUILD
index 64d63ddf2..25ed02f70 100644
--- a/community/bsdiff/PKGBUILD
+++ b/community/bsdiff/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=6
 pkgdesc="bsdiff and bspatch are tools for building and applying patches to binary files."
 url="http://www.daemonology.net/bsdiff/"
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2')
 source=(http://www.daemonology.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	Makefile.patch)
diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD
index 530c3bd98..9a8f86538 100644
--- a/community/btanks/PKGBUILD
+++ b/community/btanks/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=btanks
 pkgver=0.9.8083
 pkgrel=3
 pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://btanks.sourceforge.net"
 license=('GPL')
 depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image'
diff --git a/community/bti/PKGBUILD b/community/bti/PKGBUILD
index 63b104f0c..c556df8d7 100644
--- a/community/bti/PKGBUILD
+++ b/community/bti/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bti
 pkgver=032
 pkgrel=1
 pkgdesc='Console client for Twitter and identi.ca'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth')
diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD
index d847b6037..48f49d067 100644
--- a/community/bullet/PKGBUILD
+++ b/community/bullet/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('bullet' 'bullet-docs')
 pkgver=2.79
 pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
 depends=('freeglut')
diff --git a/community/buoh/PKGBUILD b/community/buoh/PKGBUILD
index 3d4fb093f..371abe0e0 100644
--- a/community/buoh/PKGBUILD
+++ b/community/buoh/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=buoh
 pkgver=0.8.2
 pkgrel=4
 pkgdesc="A reader for online strips comics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://buoh.steve-o.org/"
 license=('GPL')
 depends=('libgnomeui' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 7af95150b..8d34c17d3 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -6,8 +6,8 @@ pkgname=busybox
 pkgver=1.19.2
 pkgrel=3
 pkgdesc="Utilities for rescue and embedded systems"
-arch=("i686" "x86_64")
-url="http://www.busybox.net"
+arch=("i686" "x86_64" 'mips64el')
+url="http://busybox.net"
 license=('GPL')
 makedepends=("make" "gcc" "sed" "ncurses")
 source=($url/downloads/$pkgname-$pkgver.tar.bz2
diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD
index 72b3810c2..6fa870990 100644
--- a/community/bwbar/PKGBUILD
+++ b/community/bwbar/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=bwbar
 pkgver=1.2.3
 pkgrel=2
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="Generates text and graphical readout of the current bandwidth usage."
 url="http://www.kernel.org/pub/software/web/bwbar/"
 license=("GPL")
diff --git a/community/bwm-ng/PKGBUILD b/community/bwm-ng/PKGBUILD
index 8e1aee5ca..bfd69190f 100644
--- a/community/bwm-ng/PKGBUILD
+++ b/community/bwm-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bwm-ng
 pkgver=0.6
 pkgrel=3
 pkgdesc="A small and simple console-based live bandwidth monitor"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gropp.org/"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/cabextract/PKGBUILD b/community/cabextract/PKGBUILD
index 07dca6cef..ba6680251 100644
--- a/community/cabextract/PKGBUILD
+++ b/community/cabextract/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cabextract
 pkgver=1.4
 pkgrel=2
 pkgdesc="A program to extract Microsoft cabinet (.CAB) files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cabextract.org.uk/"
 depends=('glibc')
diff --git a/community/cadaver/PKGBUILD b/community/cadaver/PKGBUILD
index ec11fd70f..48f5205db 100644
--- a/community/cadaver/PKGBUILD
+++ b/community/cadaver/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cadaver
 pkgver=0.23.3
 pkgrel=2
 pkgdesc="Command-line WebDAV client for Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webdav.org/cadaver"
 license=('GPL')
 depends=('neon')
diff --git a/community/cairo-clock/PKGBUILD b/community/cairo-clock/PKGBUILD
index 110270fc2..31900493c 100644
--- a/community/cairo-clock/PKGBUILD
+++ b/community/cairo-clock/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cairo-clock
 pkgver=0.3.4
 pkgrel=1
 pkgdesc="It's an analog clock displaying the system-time."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://macslow.thepimp.net/?page_id=23'
 license=('GPL')
 depends=('cairo' 'libglade>=2.6.0' 'librsvg>=2.14.0')
diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD
index dde0b7713..7edc07f86 100644
--- a/community/cairo-compmgr/PKGBUILD
+++ b/community/cairo-compmgr/PKGBUILD
@@ -13,7 +13,7 @@ _commit=348f149af30bc829c2100d0e622c5dcaf43925b7
 pkgrel=1
 epoch=1
 pkgdesc="A Cairo based composite manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://cairo-compmgr.tuxfamily.org/"
 license=(GPL)
 makedepends=(gettext gtk-doc "intltool>=0.41" git)
diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD
index 129fa3fc9..622528c4a 100644
--- a/community/calc/PKGBUILD
+++ b/community/calc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=calc
 pkgver=2.12.4.4
 pkgrel=1
 pkgdesc="console calculator"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.isthe.com/chongo/tech/comp/calc/"
 license=('GPL')
 depends=(glibc)
diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD
index a3cae0512..7deb25387 100644
--- a/community/calcurse/PKGBUILD
+++ b/community/calcurse/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=calcurse
 pkgver=2.9.2
 pkgrel=1
 pkgdesc='A text-based personal organizer.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://calcurse.org/'
 license=('BSD')
 depends=('ncurses')
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index af9fd6d17..ac163851d 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=calibre
 pkgver=0.8.36
 pkgrel=1
 pkgdesc="Ebook management application"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
 license=('GPL3')
 depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD
index 30a78fbef..3f0bbe4ab 100644
--- a/community/camlp5/PKGBUILD
+++ b/community/camlp5/PKGBUILD
@@ -9,7 +9,7 @@ _patchlevel=0
 #pkgver=${_baseversion}.${_patchlevel}
 pkgver=${_baseversion}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pauillac.inria.fr/~ddr/camlp5/'
 license=('BSD')
 depends=('ocaml')
diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD
index d1ff35fe2..184290b1e 100644
--- a/community/canorus/PKGBUILD
+++ b/community/canorus/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=canorus
 pkgver=0.7.R1002
 pkgrel=4
 pkgdesc="A free music score editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.canorus.org/"
 license=('GPL')
 depends=('qt' 'alsa-lib' 'python2' 'swig')
diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD
index 99c4e4366..2a1de1674 100644
--- a/community/caph/PKGBUILD
+++ b/community/caph/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: jose <jose1711 [at] gmail (dot) com>
 
 pkgname=caph
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgver=1.1
 pkgrel=1
 pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element"
diff --git a/community/castget/PKGBUILD b/community/castget/PKGBUILD
index c46124cef..df0ee279c 100644
--- a/community/castget/PKGBUILD
+++ b/community/castget/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=castget
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="A simple, command-line based RSS enclosure downloader"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/castget/"
 license=('GPL')
 depends=('glib2' 'libxml2' 'curl' 'id3lib')
diff --git a/community/catdvi/PKGBUILD b/community/catdvi/PKGBUILD
index a15f0e3e1..d75c81ab1 100644
--- a/community/catdvi/PKGBUILD
+++ b/community/catdvi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=catdvi
 pkgver=0.14
 pkgrel=4
 pkgdesc="A DVI to plain text translator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://catdvi.sourceforge.net"
 license=('GPL')
 depends=('glibc' 'texlive-core')
diff --git a/community/ccd2iso/PKGBUILD b/community/ccd2iso/PKGBUILD
index 999e55d53..907e8fae1 100644
--- a/community/ccd2iso/PKGBUILD
+++ b/community/ccd2iso/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ccd2iso
 pkgver=0.3
 pkgrel=6
 pkgdesc="Converts CCD/IMG CloneCD images to ISO format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ccd2iso"
 license=('GPL')
 depends=('glibc')
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index aaa13e93f..5a8d76997 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ccid
 pkgver=1.4.5
 pkgrel=2
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pcsclite.alioth.debian.org/ccid.html"
 license=('LGPL' 'GPL')
 depends=('pcsclite')
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 758c47069..dd09fa284 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cclive
 pkgver=0.7.8
 pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
 license=('GPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi')
diff --git a/community/ccmalloc/PKGBUILD b/community/ccmalloc/PKGBUILD
index bbb271bf8..95df39a45 100644
--- a/community/ccmalloc/PKGBUILD
+++ b/community/ccmalloc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ccmalloc
 pkgver=0.4.0
 pkgrel=2
 pkgdesc="Track down memory related problems with C and C++ programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/ccmalloc"
 license=('GPL2')
 depends=('sh')
diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD
index 13ac0026b..e50fdefcc 100644
--- a/community/ccrtp/PKGBUILD
+++ b/community/ccrtp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ccrtp
 pkgver=1.8.0
 pkgrel=1
 pkgdesc="GNU ccRTP"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ccrtp"
 license=('GPL' 'custom')
 depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt')
diff --git a/community/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD
index c2960de0e..eda5acd9e 100644
--- a/community/ccrypt/PKGBUILD
+++ b/community/ccrypt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ccrypt
 pkgver=1.9
 pkgrel=1
 pkgdesc="A command-line utility for encrypting and decrypting files and streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ccrypt.sourceforge.net"
 license=('GPL2')
 depends=('glibc')
diff --git a/community/ccze/PKGBUILD b/community/ccze/PKGBUILD
index 0ff0df300..160886073 100644
--- a/community/ccze/PKGBUILD
+++ b/community/ccze/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=ccze
 pkgver=0.2.1
-pkgrel=5
+pkgrel=5.1
 pkgdesc="Robust and modular log colorizer with many plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/ccze/"
 license=('GPL')
 depends=('ncurses' 'pcre')
@@ -24,7 +24,7 @@ build() {
   sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' -i src/Makefile.in
   sed -e '/#undef error_t/d' -i system.h.in
 
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
   make
 }
 
diff --git a/community/cdbxx/PKGBUILD b/community/cdbxx/PKGBUILD
index 3caa5d468..671485ef7 100644
--- a/community/cdbxx/PKGBUILD
+++ b/community/cdbxx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdbxx
 pkgver=0.0.1rc2
 pkgrel=2
 pkgdesc="cdbxx is a small STL style C++ library for TinyCDB implementation of Constant Database"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://cdbxx.sourceforge.net/"
 license=("GPL")
 depends=(gcc)
diff --git a/community/cdcd/PKGBUILD b/community/cdcd/PKGBUILD
index f9d78ad68..57338fc35 100644
--- a/community/cdcd/PKGBUILD
+++ b/community/cdcd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdcd
 pkgver=0.6.6
 pkgrel=6
 pkgdesc="A commandline cd-player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libcdaudio' 'readline')
 url="http://libcdaudio.sourceforge.net/"
 license=('GPL2')
diff --git a/community/cdck/PKGBUILD b/community/cdck/PKGBUILD
index 260a77374..bfe461b59 100644
--- a/community/cdck/PKGBUILD
+++ b/community/cdck/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cdck
 pkgver=0.7.0
 pkgrel=3
 pkgdesc="A simple program to verify CD/DVD quality"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://swaj.net/unix/"
 license=('GPL')
 depends=(gcc-libs)
diff --git a/community/cdcover/PKGBUILD b/community/cdcover/PKGBUILD
index 8abe05627..255d1136f 100644
--- a/community/cdcover/PKGBUILD
+++ b/community/cdcover/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdcover
 pkgver=0.7.4
 pkgrel=4
 pkgdesc="cdcover allows the creation of inlay-sheets for cd-cases and dvd's"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdcover.sourceforge.net"
 license=('GPL')
 depends=('python2' 'tk')
diff --git a/community/cddb-py/PKGBUILD b/community/cddb-py/PKGBUILD
index 6c745cbf7..2c871e955 100644
--- a/community/cddb-py/PKGBUILD
+++ b/community/cddb-py/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cddb-py
 pkgver=1.4
 pkgrel=5
 pkgdesc="CDDB-Server access from Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cddb-py.sourceforge.net"
 license=('GPL')
 depends=('python2')
diff --git a/community/cdemu-client/PKGBUILD b/community/cdemu-client/PKGBUILD
index 25cfe59f7..278fa33dd 100644
--- a/community/cdemu-client/PKGBUILD
+++ b/community/cdemu-client/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cdemu-client
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="Simple command-line client for controlling cdemu-daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
 depends=('python2' 'dbus-python' 'cdemu-daemon')
diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD
index dd47d1248..da6024658 100644
--- a/community/cdemu-daemon/PKGBUILD
+++ b/community/cdemu-daemon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdemu-daemon
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="CD/DVD-ROM device emulator daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/conf.d/cdemud'
 	'etc/dbus-1/system.d/cdemud-dbus.conf')
 url="http://cdemu.sourceforge.net/"
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 99ea9bf89..73f977cb2 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdfs
 pkgver=2.6.27
 pkgrel=19
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
 license=('GPL')
 makedepends=('linux-headers')
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 770d47ef4..8087bcef1 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cegui
 pkgver=0.7.6
 pkgrel=1
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
 #options=('!libtool')
 license=("MIT")
diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD
index d55759b58..f22201bd7 100644
--- a/community/celt-0.7/PKGBUILD
+++ b/community/celt-0.7/PKGBUILD
@@ -8,7 +8,7 @@ _realname=celt
 pkgver=0.7.1
 pkgrel=3
 pkgdesc="Low-latency audio communication codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.celt-codec.org"
 license=('BSD')
 depends=('libogg')
diff --git a/community/celt/PKGBUILD b/community/celt/PKGBUILD
index 5eb99975d..0b8efa1c4 100644
--- a/community/celt/PKGBUILD
+++ b/community/celt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=celt
 pkgver=0.11.1
 pkgrel=1
 pkgdesc='Low-latency audio communication codec'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.celt-codec.org'
 license=('BSD')
 depends=('libogg')
diff --git a/community/centerim/PKGBUILD b/community/centerim/PKGBUILD
index 2e668188f..f206f6f19 100644
--- a/community/centerim/PKGBUILD
+++ b/community/centerim/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=centerim
 pkgver=4.22.10
 pkgrel=1
 pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.centerim.org"
 license=('GPL')
 depends=('python2' 'libjpeg' 'gpgme')
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index f2b6800c1..d8c3ebaa7 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=0.9.0.2
 _gitver=1.7.4
 pkgrel=3
 pkgdesc="A web interface for git written in plain C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hjemli.net/git/cgit"
 license=('GPL')
 depends=('openssl')
diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD
index d983ef86c..6d15ab543 100644
--- a/community/checkinstall/PKGBUILD
+++ b/community/checkinstall/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=checkinstall
 pkgver=1.6.2
 pkgrel=1
 pkgdesc="spy for 'make install' and build rpm or deb"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://asic-linux.com.mx/~izto/checkinstall/"
 license=('GPL')
 backup=(etc/checkinstall/checkinstallrc)
diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 28b5f9c15..3e509e4bc 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cherokee
 pkgver=1.2.101
 pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cherokee-project.com/"
 license=('GPL2')
 depends=('openssl' 'pcre')
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD
index 713974d5f..842cf4fe4 100644
--- a/community/chicken/PKGBUILD
+++ b/community/chicken/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=chicken
 pkgver=4.7.0
 pkgrel=1
 pkgdesc='A compiler for R5RS scheme, featuring handy extensions'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.call-with-current-continuation.org/'
 license=('BSD')
 depends=('gcc')
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index fc02fc811..f45fa00f0 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=chmsee
 pkgver=1.99.07
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD
index bbbc62e13..9393e9e36 100644
--- a/community/chntpw/PKGBUILD
+++ b/community/chntpw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=chntpw
 pkgver=110511
 pkgrel=1
 pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM userdatabase file'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pogostick.net/~pnh/ntpasswd/'
 license=('GPL' 'LGPL')
 makedepends=('openssl')
diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD
index 9109daf32..68d86922c 100644
--- a/community/choqok/PKGBUILD
+++ b/community/choqok/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=3
 pkgdesc="A Twitter/identi.ca/laconica client for KDE"
 url="http://choqok.gnufolks.org/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konqueror: proxy support')
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index dd6d1d9ec..a957f837a 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=chrony
 pkgver=1.26
 pkgrel=1
 pkgdesc="Dial-up friendly NTP daemon and excellent replacement for NTP on desktop systems"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://chrony.tuxfamily.org/"
 options=('strip')
 license=('GPL')
diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD
index fc1075436..0f33c5971 100644
--- a/community/chrootuid/PKGBUILD
+++ b/community/chrootuid/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=chrootuid
 pkgver=1.3
 pkgrel=4
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="Runs a command in a restricted environment."
 url="ftp://ftp.porcupine.org/pub/security/index.html"
 license=("BSD")
diff --git a/community/chrpath/PKGBUILD b/community/chrpath/PKGBUILD
index c978d17a9..6aebf2278 100644
--- a/community/chrpath/PKGBUILD
+++ b/community/chrpath/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=chrpath
 pkgver=0.13
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Change or delete the rpath or runpath in ELF files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://directory.fsf.org/project/chrpath/"
 license=('GPL2')
 depends=('glibc')
@@ -15,7 +15,7 @@ md5sums=('b73072a8fbba277558c50364b65bb407')
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
   make
 }
 
diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD
index 4365b3ed3..b8b4192d0 100644
--- a/community/cksfv/PKGBUILD
+++ b/community/cksfv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cksfv
 pkgver=1.3.14
 pkgrel=2
 pkgdesc="SFV (Simple File Verification) Checker"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD
index ada02b3dc..ae887294d 100644
--- a/community/clamz/PKGBUILD
+++ b/community/clamz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=clamz
 pkgver=0.5
 pkgrel=1
 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/clamz/'
 license=('GPL3')
 depends=('libgcrypt' 'curl' 'expat' 'shared-mime-info' 'desktop-file-utils')
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index c4b90317a..bf4035763 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=clanlib
 pkgver=2.3.4
 pkgrel=1
 pkgdesc="A multi-platform game development library."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clanlib.org/"
 license=('zlib')
 depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3')
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 729e13a9a..61359b1c2 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=classpath
 pkgver=0.98
 pkgrel=4
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/classpath/"
 license=('GPL')
 depends=('gtk2>=2.8' 'libxtst' 'libsm')
diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD
index 2aa924249..0f19cd85c 100644
--- a/community/clearsilver/PKGBUILD
+++ b/community/clearsilver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=clearsilver
 pkgver=0.10.5
 pkgrel=7
 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.clearsilver.net'
 license=('custom')
 depends=('python2' 'perl' 'ruby' 'java-runtime')
diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD
index c5ff14f7f..07a24b197 100644
--- a/community/clementine/PKGBUILD
+++ b/community/clementine/PKGBUILD
@@ -9,7 +9,8 @@ pkgrel=3
 pkgdesc="A music player and library organizer"
 url="http://www.clementine-player.org/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice')
 depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
          'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
          'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl')
diff --git a/community/clewn/PKGBUILD b/community/clewn/PKGBUILD
index f557aa50b..b3314f4e3 100644
--- a/community/clewn/PKGBUILD
+++ b/community/clewn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=clewn
 pkgver=1.15
 pkgrel=5
 pkgdesc="gdb support for vim"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clewn.sourceforge.net"
 license=('GPL')
 depends=("gvim" "gdb")
diff --git a/community/clucene/PKGBUILD b/community/clucene/PKGBUILD
index 405ebf7ee..57834619c 100644
--- a/community/clucene/PKGBUILD
+++ b/community/clucene/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=clucene
 pkgver=2.3.3.4
 pkgrel=3
 pkgdesc="C++ port of the high-performance text search engine Lucene"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clucene.sourceforge.net/"
 license=('APACHE' 'LGPL')
 depends=('gcc-libs' 'zlib' 'boost-libs')
diff --git a/community/clusterssh/PKGBUILD b/community/clusterssh/PKGBUILD
index 6c2445121..6962a2369 100644
--- a/community/clusterssh/PKGBUILD
+++ b/community/clusterssh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=clusterssh
 pkgver=3.28
 pkgrel=2
 pkgdesc="Cluster SSH opens terminal windows with connections to specified hosts and an administration console."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clusterssh.sourceforge.net/"
 license=('GPL')
 depends=('perl-tk' 'perl-x11-protocol' 'xterm')
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index a9ac9ff41..46484ec4b 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=codeblocks
 pkgver=10.05
 pkgrel=1
 pkgdesc="An open source and cross-platform C/C++ IDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codeblocks.org"
 license=('GPL3')
 depends=('wxgtk' 'hicolor-icon-theme' 'bzip2' 'shared-mime-info')
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 6dc54a8db..b1f3a44e4 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=collectd
 pkgver=5.0.1
 pkgrel=2
 pkgdesc='Daemon which collects system performance statistics periodically'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://collectd.org/'
 license=('GPL')
 options=('!libtool')
diff --git a/community/commoncpp2/PKGBUILD b/community/commoncpp2/PKGBUILD
index 411a1d3f2..5eedfa17a 100644
--- a/community/commoncpp2/PKGBUILD
+++ b/community/commoncpp2/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=commoncpp2
 pkgver=1.8.1
 pkgrel=2
 pkgdesc="GNU Common C++ 2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.gnu.org/software/commoncpp/'
 license=('GPL' 'custom')
 depends=('gcc-libs' 'zlib' 'sh')
diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD
index 40d0d28a2..1f21e760f 100644
--- a/community/compiz-bcop/PKGBUILD
+++ b/community/compiz-bcop/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=compiz-bcop
 pkgver=0.8.8
 pkgrel=1
 pkgdesc="Compiz option code generator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.compiz.org"
 license=('GPL')
 depends=('compiz-core>=0.8.8' 'libxslt')
diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD
index e542877e0..5698e5c6d 100644
--- a/community/compiz-fusion-plugins-extra/PKGBUILD
+++ b/community/compiz-fusion-plugins-extra/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=compiz-fusion-plugins-extra
 pkgver=0.8.8
 pkgrel=1
 pkgdesc="Compiz Fusion Extra plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.compiz.org"
 license=('GPL')
 depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify')
diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD
index 6720a6850..08115867a 100644
--- a/community/compiz-fusion-plugins-main/PKGBUILD
+++ b/community/compiz-fusion-plugins-main/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=compiz-fusion-plugins-main
 pkgver=0.8.8
 pkgrel=1
 pkgdesc="Compiz Fusion Main plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.compiz.org"
 license=('GPL')
 depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite'
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
index eb4a0c1fb..8f5e14815 100644
--- a/community/compiz/PKGBUILD
+++ b/community/compiz/PKGBUILD
@@ -13,7 +13,7 @@ pkgrel=2
 pkgdesc="Composite manager for Aiglx and Xgl"
 url="http://www.compiz.org/"
 license=('GPL' 'LGPL' 'MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/compizconfig-backend-gconf/PKGBUILD b/community/compizconfig-backend-gconf/PKGBUILD
index cf0df3ba9..8d21fbbea 100644
--- a/community/compizconfig-backend-gconf/PKGBUILD
+++ b/community/compizconfig-backend-gconf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=compizconfig-backend-gconf
 pkgver=0.8.8
 pkgrel=1
 pkgdesc="Compizconfig backend for gconf"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://opencompositing.org"
 license=('GPL')
 depends=('libcompizconfig' 'gconf')
diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD
index 0aeb565e6..3dd61035e 100644
--- a/community/compizconfig-python/PKGBUILD
+++ b/community/compizconfig-python/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=compizconfig-python
 pkgver=0.8.4
 pkgrel=2
 pkgdesc="Compizconfig bindings for python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://opencompositing.org"
 license=('GPL')
 depends=('compiz-core>=0.8.4' 'libcompizconfig>=0.8.4' 'glib2' 'python2')
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index e423110d6..ddfb63ec2 100755
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=confuse
 pkgver=2.7
 pkgrel=1
 pkgdesc="C-library for parsing configuration files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/confuse"
 license=('LGPL')
 depends=('glibc')
diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD
index 2f2750606..7accbc9fa 100644
--- a/community/coq/PKGBUILD
+++ b/community/coq/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=coq
 pkgver=8.3pl3
 pkgrel=1
 pkgdesc='Formal proof management system.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://coq.inria.fr/'
 license=('GPL')
 options=('!emptydirs')
diff --git a/community/corkscrew/PKGBUILD b/community/corkscrew/PKGBUILD
index 547e7980f..f7a9e0291 100644
--- a/community/corkscrew/PKGBUILD
+++ b/community/corkscrew/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=corkscrew
 pkgver=2.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A tool for tunneling SSH through HTTP proxies"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.agroman.net/corkscrew/"
 license=('GPL')
 source=(http://www.agroman.net/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 8c405a625..5c57a031e 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=couchdb
 pkgver=1.2.0
 pkgrel=2git20111115
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://couchdb.apache.org"
 license=('APACHE')
 depends=('icu' 'erlang' 'js' 'openssl' 'curl')
diff --git a/community/courier-authlib/PKGBUILD b/community/courier-authlib/PKGBUILD
index bbc05db55..2a0024544 100644
--- a/community/courier-authlib/PKGBUILD
+++ b/community/courier-authlib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=courier-authlib
 pkgver=0.63.0
 pkgrel=7
 pkgdesc="Authentification library for the courier mailserver(s)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://courier-mta.org/authlib/"
 backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \
diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD
index e1bb3f4f8..b1f818791 100644
--- a/community/courier-imap/PKGBUILD
+++ b/community/courier-imap/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=courier-imap
 pkgver=4.10.0
 pkgrel=1
 pkgdesc="IMAP(s)/POP3(s) Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.courier-mta.org/imap/"
 depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl')
diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD
index 02564d120..8988afeee 100644
--- a/community/courier-maildrop/PKGBUILD
+++ b/community/courier-maildrop/PKGBUILD
@@ -8,7 +8,7 @@ _srcname=maildrop
 pkgver=2.5.5
 pkgrel=1
 pkgdesc="mail delivery agent - procmail like but nicer syntax"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://courier-mta.org/maildrop/"
 depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm')
diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index 12ec10476..45249a6f8 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=courier-mta
 pkgver=0.67.0
 pkgrel=1
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \
         'etc/courier/imapd' 'etc/courier/imapd-ssl' \
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 6019768a5..61952125a 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cppcheck
 pkgver=1.52
 pkgrel=2
 pkgdesc="A tool for static C/C++ code analysis"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
 depends=('pcre')
diff --git a/community/cpuburn/PKGBUILD b/community/cpuburn/PKGBUILD
index a6ab49089..1f99ca267 100644
--- a/community/cpuburn/PKGBUILD
+++ b/community/cpuburn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cpuburn
 pkgver=1.4a
 pkgrel=2
 pkgdesc="CPU testing utilities in optimized assembler for maximum loading of CPUs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/ubuntu/+source/cpuburn/"
 license=('GPL')
 depends=()
diff --git a/community/cpulimit/PKGBUILD b/community/cpulimit/PKGBUILD
index 7ef5ab146..bd8d6a085 100644
--- a/community/cpulimit/PKGBUILD
+++ b/community/cpulimit/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cpulimit
 pkgver=1.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cpulimit.sourceforge.net/"
 license=("GPL")
 depends=(glibc)
@@ -15,6 +15,8 @@ md5sums=('f4ff6d4bfaef1258e8f5cd2041e2e2a3')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  make
+  # The included trivial Makefile ignores CFLAGS and LDFLAGS, so
+  # running the compiler manually here.
+  ${CC:-gcc} ${LDFLAGS} ${CFLAGS} -o cpulimit cpulimit.c -lrt
   install -D -m0755 cpulimit $startdir/pkg/usr/bin/cpulimit
 }
diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD
index 56769ac4f..52d6fe97d 100644
--- a/community/critter/PKGBUILD
+++ b/community/critter/PKGBUILD
@@ -7,7 +7,7 @@ _origname=CriticalMass
 pkgver=1.0.2
 pkgrel=5
 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/criticalmass"
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'mesa')
diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index d3e3c309c..c3a11e47d 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -11,7 +11,7 @@ fi
 
 pkgrel=1
 pkgdesc='C bindings for sfml'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sfml-dev.org/'
 license=('zlib')
 depends=('sfml')
diff --git a/community/ctpl/PKGBUILD b/community/ctpl/PKGBUILD
index 0547eabfe..0c797fec9 100644
--- a/community/ctpl/PKGBUILD
+++ b/community/ctpl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ctpl
 pkgver=0.3.3
 pkgrel=3
 pkgdesc="Template engine library written in C"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ctpl.tuxfamily.org/"
 license=('GPL')
 depends=('glib2')
diff --git a/community/cuetools/PKGBUILD b/community/cuetools/PKGBUILD
index 6626f9944..0b1d6dbb5 100644
--- a/community/cuetools/PKGBUILD
+++ b/community/cuetools/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cuetools
 pkgver=1.3.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Set of utilities for working with cue files and toc files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.berlios.de/projects/cuetools/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD
index 2c5f9afb0..606685173 100644
--- a/community/cuneiform/PKGBUILD
+++ b/community/cuneiform/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.0
 _dpkgver=1.1
 pkgrel=2
 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/cuneiform-linux"
 license=('BSD')
 depends=('imagemagick')
diff --git a/community/cupsddk/PKGBUILD b/community/cupsddk/PKGBUILD
index 3eb2dfc7a..bdb357087 100644
--- a/community/cupsddk/PKGBUILD
+++ b/community/cupsddk/PKGBUILD
@@ -11,7 +11,7 @@ url="http://cups.org"
 license=("GPL")
 depends=('libcups')
 makedepends=('libcups' 'cups')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!emptydirs')
 source=(http://ftp.easysw.com/pub/cupsddk/$pkgver/$pkgname-$pkgver-source.tar.bz2)
 md5sums=('3ec52813bf12bf9b34d34f8a81bab508')
diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD
index e0570edaf..4e2d32f79 100644
--- a/community/curlftpfs/PKGBUILD
+++ b/community/curlftpfs/PKGBUILD
@@ -5,13 +5,13 @@
 
 pkgname=curlftpfs
 pkgver=0.9.2
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl."
 url="http://curlftpfs.sourceforge.net/"
 license=('GPL')
 depends=('curl>=7.15.4' 'fuse' 'glib2')
 makedepends=('pkgconfig>=0.9.0')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz
         ioerror.patch)
 md5sums=('b452123f755114cd4461d56c648d9f12'
diff --git a/community/cutter/PKGBUILD b/community/cutter/PKGBUILD
index e48ce17d4..ee3a8cfb1 100644
--- a/community/cutter/PKGBUILD
+++ b/community/cutter/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cutter
 pkgver=1.03
-pkgrel=3
+pkgrel=3.1
 pkgdesc="TCP/IP Connection cutting on Linux Firewalls and Routers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lowth.com/cutter/"
 license=('GPL')
 depends=(glibc)
@@ -15,6 +15,8 @@ md5sums=('50093db9b64277643969ee75b83ebbd1')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  make || return 1
+  # The included trivial Makefile ignores CFLAGS and LDFLAGS, so
+  # running the compiler manually here.
+  ${CC:-gcc} ${LDFLAGS} ${CFLAGS} -o cutter cutter.c
   install -D -m 0755 ./cutter $startdir/pkg/usr/bin/tcp-cutter
 }
diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD
index f80aec17b..868d99392 100644
--- a/community/cuyo/PKGBUILD
+++ b/community/cuyo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cuyo
 pkgver=2.1.2
 pkgrel=1
 pkgdesc="Tetris-style puzzle game for up to two players with a twist"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.karimmi.de/cuyo/"
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD
index 8f928328a..044545eb6 100644
--- a/community/cwiid/PKGBUILD
+++ b/community/cwiid/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cwiid
 pkgver=0.6.00
 pkgrel=9
 pkgdesc="Linux Nintendo Wiimote interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://abstrakraft.org/cwiid"
 depends=('bluez' 'gtk2' 'python2')
 makedepends=('flex' 'bison')
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index 21e58a30b..21120e17e 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=cython
 pkgver=0.15.1
 pkgrel=2
 pkgdesc="C-Extensions for Python "
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-distribute' 'python2-distribute')
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD
index a2cecbd7b..f073ceb5f 100644
--- a/community/dante/PKGBUILD
+++ b/community/dante/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.3.2
 pkgrel=1
 pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
 url="http://www.inet.no/dante"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('pam' 'krb5')
 backup=('etc/socks.conf'
diff --git a/community/darcs/PKGBUILD b/community/darcs/PKGBUILD
index d23e917a5..506374c5a 100644
--- a/community/darcs/PKGBUILD
+++ b/community/darcs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=darcs
 pkgver=2.5.2
 pkgrel=1.1
 pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://darcs.net/"
 license=('GPL')
 depends=('curl' 'gmp' 'ncurses>=5.6-7')
diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD
index 03079eb52..e6759c566 100644
--- a/community/darkhttpd/PKGBUILD
+++ b/community/darkhttpd/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=darkhttpd
 pkgver=1.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A small, static webserver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dmr.ath.cx/net/darkhttpd/"
 license=('BSD')
 depends=('glibc')
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index de207b747..864768cba 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=darkstat
 pkgver=3.0.714
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Network statistics gatherer (packet sniffer)."
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('libpcap' 'zlib')
 source=(http://dmr.ath.cx/net/darkstat/$pkgname-$pkgver.tar.bz2)
 md5sums=('eef385fadc8dbb611d3d4c4d8fa94817')
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 04e856aa9..4403207ff 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.9.3
 _pkgver=0.9
 pkgrel=4
 pkgdesc="Utility to organize and develop raw images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
diff --git a/community/datemath/PKGBUILD b/community/datemath/PKGBUILD
index f4ce236b5..157812a04 100644
--- a/community/datemath/PKGBUILD
+++ b/community/datemath/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=datemath
 pkgver=2.0.10
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Command line date and time math utility."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.unixwiz.net/tools/datemath.html"
 license=("GPL")
 depends=('glibc')
@@ -16,6 +16,7 @@ md5sums=('2c369d70a43313b71dbe3c7cc50207de')
 
 build() {
   cd $srcdir
-  make || return 1
+  sed -ri 's/CFLAGS\s*=\s*.*/CFLAGS='"$CFLAGS $LDFLAGS"'/' Makefile
+  make
   install -D -m755 $srcdir/datemath $pkgdir/usr/bin/datemath
 }
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 9610e41c8..182925d56 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dbmail
 pkgver=2.2.17
 pkgrel=2
 pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 # mhash libevent libzdb
 depends=('gmime22')
 makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'  'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
diff --git a/community/dbus-sharp-glib/PKGBUILD b/community/dbus-sharp-glib/PKGBUILD
index bd28aeede..e1a72c763 100644
--- a/community/dbus-sharp-glib/PKGBUILD
+++ b/community/dbus-sharp-glib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dbus-sharp-glib
 pkgver=0.5.0
 pkgrel=3
 pkgdesc="C# GLib implementation of D-Bus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/mono/dbus-sharp/"
 license=('custom')
 depends=('dbus-sharp>=0.7')
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 1ea5f1978..83ceb2f38 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=deadbeef
 pkgver=0.5.1
 pkgrel=4
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://deadbeef.sourceforge.net'
 license=('GPL2')
 depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD
index 450698d29..f9c34e047 100644
--- a/community/delegate/PKGBUILD
+++ b/community/delegate/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=delegate
 pkgver=9.9.7
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.delegate.org/"
 license=('GPL')
 depends=('pam')
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index e11a3e4b7..d12c5680b 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=denemo
 pkgver=0.9.2
 pkgrel=1
 pkgdesc="A music score editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.denemo.org"
 license=('GPL')
 depends=('aubio' 'portaudio' 'lilypond' 'gtk2' 'libxml2' 'guile' 'fftw' 'gtksourceview2'
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 4cf31e845..b1fa118b2 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=devil
 pkgver=1.7.8
 pkgrel=9
 pkgdesc="Library for reading several different image formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openil.sourceforge.net/"
 depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
 install=devil.install
diff --git a/community/dfm/PKGBUILD b/community/dfm/PKGBUILD
index 0c290ebd2..fcca5e41c 100644
--- a/community/dfm/PKGBUILD
+++ b/community/dfm/PKGBUILD
@@ -5,9 +5,9 @@
 #
 pkgname=dfm
 pkgver=0.99.9
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A graphical file manager including desktop icons"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk' 'imlib' 'libxpm')
 license=('GPL')
 source=(http://www.kaisersite.de/dfm/$pkgname-$pkgver.tar.gz)
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index 4663a3987..8af32da0d 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dia
 pkgver=0.97.2
 pkgrel=1
 pkgdesc="A GTK+ based diagram creation program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/Dia"
 install=dia.install
diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD
index 7ba6a1d1d..db4218b2b 100644
--- a/community/dictd/PKGBUILD
+++ b/community/dictd/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc="Online dictionary client and server"
 url="http://sourceforge.net/projects/dict/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('sh' 'zlib' 'libmaa')
 makedepends=('flex')
 backup=(etc/dict/dictd.conf
diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD
index 7ea29eab2..1eac2db70 100644
--- a/community/dietlibc/PKGBUILD
+++ b/community/dietlibc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dietlibc
 pkgver=0.32
 pkgrel=2
 pkgdesc="a libc optimized for small size"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fefe.de/dietlibc/"
 license=("GPL")
 #source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2)
diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD
index 111906348..20b975395 100644
--- a/community/dillo/PKGBUILD
+++ b/community/dillo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dillo
 pkgver=3.0.2
 pkgrel=1
 pkgdesc="A small, fast graphical web browser built on FLTK"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.dillo.org"
 license=('GPL')
 depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor'
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index 322155d9f..113aec0ed 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=directfb
 pkgver=1.4.14
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.directfb.org"
 license=('LGPL')
 depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
diff --git a/community/discid/PKGBUILD b/community/discid/PKGBUILD
index d77a3a02c..7489c5a92 100644
--- a/community/discid/PKGBUILD
+++ b/community/discid/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=discid
 pkgver=0.1.3
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A program to calculate the disc-ID for audio compact discs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://discid.sourceforge.net"
 license=("GPL")
 depends=(gcc-libs)
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index 42edd6cb8..3e33ace62 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=distcc
 pkgver=3.1
 pkgrel=6
 pkgdesc="A distributed C, C++, Obj C compiler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/distcc/"
 license=('GPL')
 depends=('gcc' 'popt' 'avahi')
diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD
index 3923d1b2d..acccf6688 100644
--- a/community/djview4/PKGBUILD
+++ b/community/djview4/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 pkgdesc='Portable DjVu viewer and browser plugin'
 url='http://djvu.sourceforge.net/djview4.html'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qt' 'djvulibre')
 source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
 sha1sums=('266d207afb63a1ee63eed054190bf88888fda572')
diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD
index 050157357..567704b27 100644
--- a/community/dmenu/PKGBUILD
+++ b/community/dmenu/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=4.5
 pkgrel=1
 pkgdesc="A generic menu for X"
 url="http://tools.suckless.org/dmenu/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('sh' 'libxinerama')
 source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz")
@@ -25,3 +25,4 @@ package() {
   make PREFIX=/usr DESTDIR=$pkgdir install
   install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
+md5sums=('85204de9ac040e0ba544978ce6d6a105')
diff --git a/community/dnstracer/PKGBUILD b/community/dnstracer/PKGBUILD
index 3964c47f3..e2fcb7eba 100644
--- a/community/dnstracer/PKGBUILD
+++ b/community/dnstracer/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgname=dnstracer
 pkgver=1.9
-pkgrel=3
+pkgrel=3.1
 pkgdesc='Determines where a given DNS server gets its information from, and follows the chain of DNS servers'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mavetju.org/unix/dnstracer.php'
 license=('BSD')
 source=("http://www.mavetju.org/download/$pkgname-$pkgver.tar.gz")
diff --git a/community/docbook2x/PKGBUILD b/community/docbook2x/PKGBUILD
index 42dab69b1..c44257c3d 100644
--- a/community/docbook2x/PKGBUILD
+++ b/community/docbook2x/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=docbook2x
 pkgver=0.8.8
 pkgrel=9
 pkgdesc="A software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo format."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://docbook2x.sourceforge.net"
 license=("MIT")
 depends=('glibc' 'perl-sgmls' 'perlxml' 'perl-xml-sax' 'libxslt')
diff --git a/community/dockmanager/PKGBUILD b/community/dockmanager/PKGBUILD
index 0d91fb975..11248a9b5 100644
--- a/community/dockmanager/PKGBUILD
+++ b/community/dockmanager/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.1.0
 pkgrel=0.20110211
 pkgdesc="Dock-independent helper scripts for compatible docks"
 url="https://launchpad.net/dockmanager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(GPL)
 depends=('libdesktop-agnostic>=0.3.90-2' gconf dbus-glib python2)
 makedepends=(bzr 'vala>=0.10' pkgconfig intltool autoconf gnome-common)
diff --git a/community/docky/PKGBUILD b/community/docky/PKGBUILD
index 636d2e762..29807f42f 100644
--- a/community/docky/PKGBUILD
+++ b/community/docky/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.1.3
 pkgrel=1
 pkgdesc="The finest dock no money can buy!"
 url="https://launchpad.net/docky"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(GPL)
 depends=(gnome-desktop-sharp gnome-keyring-sharp gtk2 mono-addins
          hicolor-icon-theme ndesk-dbus-glib notify-sharp-svn xdg-utils
diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD
index a240c3a0a..c41d3f872 100644
--- a/community/dopewars/PKGBUILD
+++ b/community/dopewars/PKGBUILD
@@ -6,11 +6,11 @@
 
 pkgname=dopewars
 pkgver=1.5.12
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A drug dealing game set in New York"
 url="http://dopewars.sourceforge.net/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'alsa-lib' 'audiofile' 'sdl_mixer' 'ncurses')
 install='dopewars.install'
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
diff --git a/community/drivel/PKGBUILD b/community/drivel/PKGBUILD
index 82ae3dda9..6931a5aae 100644
--- a/community/drivel/PKGBUILD
+++ b/community/drivel/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.0.3
 pkgrel=1
 pkgdesc="GTK client for working with online journals (blogs)."
 url="http://www.dropline.net/drivel/index.php"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("GPL")
 depends=('curl' 'gtksourceview2' 'gtkspell' 'libgnomeui>=2.0.0' 'libsoup')
 makedepends=('perlxml' 'pkgconfig' 'intltool>=0.21' 'gnome-doc-utils>=0.3.2')
diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD
index 8dea9cf86..d7bcb0f4a 100644
--- a/community/dsniff/PKGBUILD
+++ b/community/dsniff/PKGBUILD
@@ -7,7 +7,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids')
 source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD
index 5ccb4d4c6..7336ea836 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dspam
 pkgver=3.10.1
 pkgrel=2
 pkgdesc="A scalable, open-source statistical anti-spam filter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dspam.nuclearelephant.com/"
 backup=('etc/dspam/dspam.conf'
 	'srv/http/dspam/cgi-bin/admins'
diff --git a/community/dtach/PKGBUILD b/community/dtach/PKGBUILD
index 1324f4731..228fc9b9b 100644
--- a/community/dtach/PKGBUILD
+++ b/community/dtach/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=dtach
 pkgver=0.8
-pkgrel=4
+pkgrel=4.1
 pkgdesc="emulates the detach feature of screen"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dtach.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD
index c8701a37b..368c1cc9e 100644
--- a/community/dumb/PKGBUILD
+++ b/community/dumb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dumb
 pkgver=0.9.3
 pkgrel=5
 pkgdesc="An IT, XM, S3M and MOD player library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:dumb' 'GPL')
 url="http://dumb.sourceforge.net/"
 depends=('glibc' 'allegro4')
@@ -15,7 +15,7 @@ md5sums=('f48da5b990aa8aa822d3b6a951baf5c2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
+  [ "${CARCH}" != "i686" ] && export CFLAGS="${CFLAGS} -fPIC"
   # Create the directories which the Makefile somehow fails to create
   install -d lib/unix/{debug,release}
 
@@ -30,7 +30,8 @@ ALL_TARGETS := core core-examples core-headers
 ALL_TARGETS += allegro allegro-examples allegro-headers
 PREFIX := "$pkgdir/usr"
 EOF
-
+  # For some reason -lm is not linked for Allegro examples.
+  sed -ri 's/^(LINK_ALLEGRO := .+)$/\1 -lm/' make/unix.inc
   # Upstream's makefile ignores our CFLAGS.  They put -I directives in
   # their own CFLAGS, so we can't just say
   # make CFLAGS=...
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index 955bd64db..5c3163f90 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=duplicity
 pkgver=0.6.17
 pkgrel=4
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
 depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface')
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index d9b1130c9..ef29f0595 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=dvdisaster
 pkgver=0.72.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dvdisaster.com/"
 license=('GPL')
 depends=('gtk2')
diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
index 358b4251d..fa4aa851a 100644
--- a/community/dvtm/PKGBUILD
+++ b/community/dvtm/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=dvtm
 pkgver=0.7
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Dynamic virtual terminal manager.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.brain-dump.org/projects/dvtm/'
 license=('MIT')
 depends=('ncurses')
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index a7dbde031..5042e9358 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dwdiff
 pkgver=2.0
 pkgrel=1
 pkgdesc="a front-end for the diff program that operates at the word level instead of the line level"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://os.ghalkes.nl/dwdiff.html"
 depends=('diffutils' 'icu')
 license=('GPL')
diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD
index b2fceeb60..6fad2aa73 100644
--- a/community/dwm/PKGBUILD
+++ b/community/dwm/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=6.0
 pkgrel=1
 pkgdesc="A dynamic window manager for X"
 url="http://dwm.suckless.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 options=(zipman)
 depends=('libx11' 'libxinerama')
diff --git a/community/dxpc/PKGBUILD b/community/dxpc/PKGBUILD
index 298989028..d689b83e2 100644
--- a/community/dxpc/PKGBUILD
+++ b/community/dxpc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dxpc
 pkgver=3.9.2
 pkgrel=3
 pkgdesc="Differential X Protocol Compressor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vigor.nu/dxpc/"
 license=('GPL')
 depends=('lzo2' 'gcc-libs')
diff --git a/community/dynamite/PKGBUILD b/community/dynamite/PKGBUILD
index 9f8828426..85efe924a 100644
--- a/community/dynamite/PKGBUILD
+++ b/community/dynamite/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=dynamite
 pkgver=0.1.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Dynamite is a tool and library for decompressing data compressed with PKWARE Data Compression Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=("GPL")
 source=(http://downloads.sourceforge.net/sourceforge/synce/libdynamite-$pkgver.tar.gz)
diff --git a/community/dzen2/PKGBUILD b/community/dzen2/PKGBUILD
index 810d8ba52..a6b1cf4a1 100644
--- a/community/dzen2/PKGBUILD
+++ b/community/dzen2/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=dzen2
 pkgver=0.8.5
 pkgrel=7
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="X notification utility"
 url="http://gotmor.googlepages.com/dzen"
 license=("MIT")
@@ -18,11 +18,10 @@ build()
 {
   cd $srcdir/dzen2-$pkgver
 
-  CFLAGS=" -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
-  LIBS=" -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`"
+  CFLAGS=" ${CFLAGS} ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
+  LIBS=" ${LDFLAGS} -L/usr/lib -lc -lX11 -lXinerama -lXpm `pkg-config --libs xft`"
 
   echo "CFLAGS=$CFLAGS" >>config.mk
-  echo "LIBS=$LIBS" >>config.mk
   echo "LDFLAGS=$LIBS" >>config.mk
 
   make X11INC=/usr/include X11LIB=/usr/lib
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index 7503cd49c..3c4fdaa7f 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=e-modules-extra-svn
 pkgver=66883
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-extra-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 661cf098c..1fefb73e0 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=e-svn
 pkgver=66935
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index c9a504032..5e402a167 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=e_dbus-svn
 pkgver=66792
 pkgrel=1
 pkgdesc="dbus abstraction layer for e17"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/echat/PKGBUILD b/community/echat/PKGBUILD
index ff17db8f2..a9b0c08a0 100644
--- a/community/echat/PKGBUILD
+++ b/community/echat/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=echat
 pkgver=0.04beta1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="vypress compatible ncurses chat (can work without server)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://echat.deep.perm.ru/"
 license=(GPL)
 depends=(ncurses)
@@ -22,6 +22,8 @@ md5sums=('dda3891d08f04dd266858380d404af15')
 
 build() {
   cd ${startdir}/src/$pkgname-${pkgver}
+  sed -ri -e 's/^CFLAGS=.*/CFLAGS='"${CFLAGS}"'/' \
+    -e 's/@\$\(CC\) -o \$@ /@$(CC) '"${LDFLAGS}"' -o $@ /' Makefile
   make || return 1
   install -D -m 0755 echat $startdir/pkg/usr/bin/echat && \
   install -D -m 0644 doc/echat.1 $startdir/pkg/usr/share/man/man1/echat.1 && \
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index f93c97e24..3ca1b065e 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ecore-svn
 pkgver=66892
 pkgrel=1
 pkgdesc="Ecore is an abstraction layer for e17"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 73421fa4d..b2d14c0b0 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=edje-svn
 pkgver=66943
 pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index 69ef05f7b..7c6e4074c 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=eet-svn
 pkgver=66804
 pkgrel=1
 pkgdesc="A data storage and compression library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index acf505473..b901f211a 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=eeze-svn
 pkgver=66151
 pkgrel=1
 pkgdesc="A data storage and compression library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index d2866c30e..5bef98708 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=efreet-svn
 pkgver=66149
 pkgrel=1
 pkgdesc="freedesktop.org specifications for e17"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD
index bbb759c28..b7fe83637 100644
--- a/community/egoboo/PKGBUILD
+++ b/community/egoboo/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=egoboo
 pkgver=2.8.1
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="An open-source action RPG/dungeon crawling adventure with OpenGL 3D graphics"
 url="http://egoboo.sourceforge.net/"
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index 34e23001d..fab4becb5 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=eina-svn
 pkgver=66864
 pkgrel=1
 pkgdesc="E17 file chunk reading/writing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('LGPL2')
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 8b49698f2..ce4c8437c 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ejabberd
 pkgver=2.1.10
 pkgrel=1
 pkgdesc="An erlang jabber server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.ejabberd.im/"
 license=("GPL")
 depends=('expat' 'openssl' 'zlib' 'erlang' 'pam')
diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD
index 2c504ff40..8c87efc02 100644
--- a/community/ekg/PKGBUILD
+++ b/community/ekg/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=ekg
 pkgver=1.8rc2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A text-mode Gadu-Gadu client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ekg.chmurka.net/"
 license=('GPL')
 depends=('libjpeg' 'aspell' 'python2' 'giflib' 'libgadu')
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
index ed73f1dc5..0d3ed7174 100644
--- a/community/ekg2/PKGBUILD
+++ b/community/ekg2/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=ekg2
 pkgver=0.3.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ekg2.org/"
 license=('GPL')
 depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme')
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 7cccb9b67..f2ac0230c 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=electricsheep
 pkgver=2.7b12
 pkgrel=5
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.electricsheep.org/"
 license=('GPL')
 depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index 7dc5407b5..4e4254a93 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=elementary-svn
 pkgver=66938
 pkgrel=1
 pkgdesc="Enlightenment's basic widget set"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 57957d67c..afb04adac 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=0.13
 _commit="30c485af4c4ba128d82171a6066594f3cfaeae5d"
 pkgrel=9
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://elinks.or.cz"
 license=('GPL')
 depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'js'
diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD
index 56333d367..f9798663b 100644
--- a/community/emacs-nox/PKGBUILD
+++ b/community/emacs-nox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=emacs-nox
 pkgver=23.3
 pkgrel=2
 pkgdesc="The Emacs Editor, without X11 support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL')
 replaces=('cedet')
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index de394c061..1b04b03b1 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=embryo-svn
 pkgver=66150
 pkgrel=1
 pkgdesc="implementation of a C like scripting language for e17"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD
index bbed29dc5..b811963bd 100644
--- a/community/emerald/PKGBUILD
+++ b/community/emerald/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=emerald
 pkgver=0.8.8
 pkgrel=1
 pkgdesc="Emerald window decorator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.compiz.org"
 license=('GPL')
 depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils')
diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD
index 75bb850cc..296ebb37d 100755
--- a/community/emprint-svn/PKGBUILD
+++ b/community/emprint-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=emprint-svn
 pkgver=64443
 pkgrel=1
 pkgdesc="screenshot module for e17"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-extra-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index 3e920f673..402c2e4ea 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=encfs
 pkgver=1.7.4
 pkgrel=6
 pkgdesc='Encrypted filesystem in user-space'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.arg0.net/encfs'
 license=('GPL')
 depends=('rlog' 'openssl' 'fuse' 'boost-libs')
diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD
index 42f66822f..b2c08e8b2 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=enet
 pkgver=1.3.3
 pkgrel=1
 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://enet.bespin.org/'
 license=('custom')
 depends=('glibc')
diff --git a/community/enigma/PKGBUILD b/community/enigma/PKGBUILD
index d29811b7f..d7923a073 100644
--- a/community/enigma/PKGBUILD
+++ b/community/enigma/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=enigma
 pkgver=1.04
 pkgrel=3
 pkgdesc=" Enigma is a puzzle game involving falling blocks"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~sgtatham/enigma/"
 license=('custom')
 depends=('ncurses')
diff --git a/community/enter/PKGBUILD b/community/enter/PKGBUILD
index 9ce24fd0f..e74da4ff0 100644
--- a/community/enter/PKGBUILD
+++ b/community/enter/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enter
 pkgver=0.0.9
 pkgrel=3
 pkgdesc="Enter is a lightweight graphical login manager for X."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://enter.sf.net"
 license=('GPL')
 depends=('libxft' 'imlib2' 'xorg-server')
diff --git a/community/epic4/PKGBUILD b/community/epic4/PKGBUILD
index f975aa7c5..173529e25 100644
--- a/community/epic4/PKGBUILD
+++ b/community/epic4/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=epic4
 pkgver=2.10.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="EPIC4 is a new direction in ircII development"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.epicsol.org/"
 license=('custom')
 depends=('openssl' 'ncurses' 'tcl' 'perl')
diff --git a/community/esekeyd/PKGBUILD b/community/esekeyd/PKGBUILD
index b0122e70f..a3e513814 100644
--- a/community/esekeyd/PKGBUILD
+++ b/community/esekeyd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=esekeyd
 pkgver=1.2.7
 pkgrel=1
 pkgdesc="Multimedia keyboard driver for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/esekeyd/"
 license=('GPL')
 depends=('glibc' 'sh')
diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD
index b275244ff..a29008e29 100644
--- a/community/esmtp/PKGBUILD
+++ b/community/esmtp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=esmtp
 pkgver=1.2
 pkgrel=4
 pkgdesc="An easy SMTP forwarder."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://esmtp.sourceforge.net'
 license=('GPL')
 depends=('libesmtp' 'openssl')
diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD
index 5611a89e1..caee5b9a3 100644
--- a/community/espeak/PKGBUILD
+++ b/community/espeak/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=espeak
 pkgver=1.46.01
 pkgrel=1
 pkgdesc="Text to Speech engine for good quality English, with support for other languages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://espeak.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs' 'portaudio')
diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD
index 89061f262..2345d7f6c 100644
--- a/community/espeakup/PKGBUILD
+++ b/community/espeakup/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=espeakup
 pkgver=0.71
 pkgrel=3
 pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/williamh/espeakup"
 license=('GPL3')
 source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2"
diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD
index eb7e1f045..2e3713e94 100644
--- a/community/etherape/PKGBUILD
+++ b/community/etherape/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=etherape
 pkgver=0.9.12
 pkgrel=1
 pkgdesc="A graphical network monitor for various OSI layers and protocols"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://etherape.sourceforge.net/"
 license=('GPL2')
 depends=('libgnomeui' 'libpcap')
diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD
index 844fd7b56..25aaf34b9 100644
--- a/community/etl/PKGBUILD
+++ b/community/etl/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=etl
 pkgver=0.04.14
 pkgrel=1
 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
 license=('GPL2')
 depends=()
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index 6bb6364d1..b3018c5d8 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=evas-svn
 pkgver=66901
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index aefe386cd..2f7851f25 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=exim
 pkgver=4.77
 pkgrel=2
 pkgdesc="Message Transfer Agent"
-arch=('x86_64' 'i686')
+arch=(i686 x86_64 'mips64el')
 url="http://www.exim.org/"
 license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf \
diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD
index c9c3d4467..e4cdc270b 100644
--- a/community/expac/PKGBUILD
+++ b/community/expac/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=expac
 pkgver=0.07
 pkgrel=1
 pkgdesc="pacman database extraction utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/expac"
 license=('GPL')
 depends=('pacman')
diff --git a/community/ext3grep/PKGBUILD b/community/ext3grep/PKGBUILD
index 4e70cdc95..b44e3a01e 100644
--- a/community/ext3grep/PKGBUILD
+++ b/community/ext3grep/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ext3grep
 pkgver=0.10.2
 pkgrel=1
 pkgdesc="A tool to investigate an ext3 file system for deleted content and possibly recover it"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/ext3grep/"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD
index 7206154f9..5a7561b7f 100644
--- a/community/extremetuxracer/PKGBUILD
+++ b/community/extremetuxracer/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=extremetuxracer
 pkgver=0.4
 pkgrel=2
 pkgdesc="Downhill racing game starring Tux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.extremetuxracer.com"
 license=('GPL')
 depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu')
diff --git a/community/extundelete/PKGBUILD b/community/extundelete/PKGBUILD
index 6f34fb6d0..9d28c5acb 100644
--- a/community/extundelete/PKGBUILD
+++ b/community/extundelete/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=extundelete
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Utility for recovering deleted files from ext2, ext3 or ext4 partitions by parsing the journal"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://extundelete.sourceforge.net"
 license=('GPL')
 makedepends=('e2fsprogs')
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index 60743f17b..09ae546f0 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fatrat
 pkgver=1.2.0_beta1
 pkgrel=3
 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fatrat.dolezel.info/"
 license=('GPL')
 depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index 03e1ffb67..26dfe6bc5 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=fb-client
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="Client for paste.xinu.at"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://paste.xinu.at"
 license=('GPL3')
 depends=('curl')
diff --git a/community/fbdump/PKGBUILD b/community/fbdump/PKGBUILD
index 1d26f0436..9fece9574 100644
--- a/community/fbdump/PKGBUILD
+++ b/community/fbdump/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fbdump
 pkgver=0.4.2
 pkgrel=2
 pkgdesc="captures the contents of the visible portion of the Linux framebuffer to stdout"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rcdrummond.net/fbdump/"
 license=("GPL")
 depends=(glibc)
diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD
index 67d344aa9..3741aa404 100644
--- a/community/fbgetty/PKGBUILD
+++ b/community/fbgetty/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.1.698
 pkgrel=3
 license=("GPL")
 pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.meuh.org/fbgetty"
 source=('http://projects.meuh.org/fbgetty/downloads/fbgetty-'$pkgver'.tar.gz')
 md5sums=('1705bc0f8f1e03fe50d324ba84ac4e56')
diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD
index 6ea2b333c..21b937397 100644
--- a/community/fbgrab/PKGBUILD
+++ b/community/fbgrab/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=fbgrab
 pkgver=1.0
 pkgrel=5
 pkgdesc="A framebuffer screenshot grabber"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://hem.bredband.net/gmogmo/fbgrab/"
 license=("GPL")
 depends=('libpng')
diff --git a/community/fbpanel/PKGBUILD b/community/fbpanel/PKGBUILD
index 0a33d0f38..08a89da45 100644
--- a/community/fbpanel/PKGBUILD
+++ b/community/fbpanel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fbpanel
 pkgver=6.1
 pkgrel=2
 pkgdesc="NetWM compliant desktop panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fbpanel.sourceforge.net/"
 depends=('gtk2')
 license=('GPL')
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index 29ac34a54..65d1d9894 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbreader
 pkgver=0.12.10
 pkgrel=2
 pkgdesc="An e-book reader for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fbreader.org/"
 license=('GPL')
 depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3')
diff --git a/community/fbshot/PKGBUILD b/community/fbshot/PKGBUILD
index 752c53faa..48d6ce110 100644
--- a/community/fbshot/PKGBUILD
+++ b/community/fbshot/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=fbshot
 pkgver=0.3
 pkgrel=3
 pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sfires.net/fbshot/"
 license=('GPL')
 depends=('libpng')
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index e1cc13f69..9c86079ca 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbv
 pkgver=1.0b
 pkgrel=4
 pkgdesc="FrameBuffer image viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://s-tech.elsat.net.pl/fbv/"
 license=('GPL')
 depends=('libpng' 'libungif' 'libjpeg')
diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD
index fcfe064ee..9c1632d33 100644
--- a/community/fceux/PKGBUILD
+++ b/community/fceux/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=fceux
 pkgver=2.1.5
 pkgrel=3
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://fceux.com/"
 pkgdesc="Fast and ultra-compatible NES/Famicom emulator"
 license=('GPL')
diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index e3c68122d..a4d9e558e 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.0.3
 _gitrev='2e301c8'
 pkgrel=2
 pkgdesc='A simple server for running CGI applications over FastCGI.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
 license=('MIT')
 depends=('fcgi' 'spawn-fcgi')
diff --git a/community/fcrackzip/PKGBUILD b/community/fcrackzip/PKGBUILD
index 58f3821ba..745b6f4fa 100644
--- a/community/fcrackzip/PKGBUILD
+++ b/community/fcrackzip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcrackzip
 pkgver=1.0
 pkgrel=2
 pkgdesc="A zip file password cracker"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.goof.com/pcg/marc/$pkgname.html"
 license=('GPL')
 depends=(glibc)
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index d2bd49b05..df4af9e0d 100755
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=fcron
 pkgver=3.0.6
 pkgrel=5
 pkgdesc="feature-rich cron implementation"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://fcron.free.fr"
 license=('GPL')
 depends=('pam')
diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD
index 5546042ad..bf8c6bad6 100644
--- a/community/fdm/PKGBUILD
+++ b/community/fdm/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc='Program to fetch and deliver mail'
 url='http://fdm.sourceforge.net/'
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
 depends=('openssl' 'tdb' 'zlib')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD
index 220f932ac..00e0bf8f0 100644
--- a/community/fdupes/PKGBUILD
+++ b/community/fdupes/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fdupes
 pkgver=1.40
 pkgrel=5
 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://premium.caribe.net/~adrian2/fdupes.html"
 license=('MIT')
 source=(http://premium.caribe.net/~adrian2/programs/$pkgname-$pkgver.tar.gz LICENSE)
diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD
index 7f086d67f..049eb0cda 100644
--- a/community/ffmpeg2theora/PKGBUILD
+++ b/community/ffmpeg2theora/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ffmpeg2theora
 pkgver=0.28
 pkgrel=2
 pkgdesc="A simple converter to create Ogg Theora files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.v2v.cc/~j/ffmpeg2theora/"
 license=('GPL3')
 depends=('ffmpeg')
diff --git a/community/fftw2/PKGBUILD b/community/fftw2/PKGBUILD
index e46a44e49..2980711e9 100644
--- a/community/fftw2/PKGBUILD
+++ b/community/fftw2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fftw2
 pkgver=2.1.5
 pkgrel=5
 pkgdesc="A C subroutine library for computing the discrete Fourier transform (DFT)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fftw.org/"
 license=('GPL2')
 depends=('glibc')
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index f495f7475..9a5035eda 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=filezilla
 pkgver=3.5.3
 pkgrel=1
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://filezilla-project.org/"
 license=('GPL')
 depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3')
diff --git a/community/fillets-ng/PKGBUILD b/community/fillets-ng/PKGBUILD
index 07a38da89..31b822703 100644
--- a/community/fillets-ng/PKGBUILD
+++ b/community/fillets-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0.0
 pkgrel=1
 pkgdesc="A port of the wonderful puzzle game Fish Fillets"
 url="http://fillets.sf.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('fillets-ng-data' 'lua' 'fribidi' 'gcc-libs' 'libx11' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'desktop-file-utils')
 install=$pkgname.install
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index 6be578f71..204b07db1 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -8,11 +8,10 @@ pkgname=fish
 pkgver=1.23.1
 pkgrel=4
 pkgdesc="User friendly shell intended mostly for interactive use"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fishshell.com/"
 license=("GPL" "LGPL" "BSD" "MIT")
 depends=('ncurses' 'bc')
-makedepends=('doxygen')
 install=fish.install
 source=(http://fishshell.com/files/$pkgver/$pkgname-$pkgver.tar.bz2)
 md5sums=('ead6b7c6cdb21f35a3d4aa1d5fa596f1')
diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD
index ffd72b248..71e3fb36c 100644
--- a/community/fityk/PKGBUILD
+++ b/community/fityk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fityk
 pkgver=1.1.1
 pkgrel=3
 pkgdesc='A program for nonlinear fitting of analytical functions to data.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.unipress.waw.pl/fityk/'
 license=('GPL')
 depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot') # wxgtk supplied by statically linked wxWidgets
diff --git a/community/flac123/PKGBUILD b/community/flac123/PKGBUILD
index b6849ca3e..1f79c330c 100644
--- a/community/flac123/PKGBUILD
+++ b/community/flac123/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=flac123
 pkgver=0.0.11
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 pkgdesc="A command-line program for playing FLAC audio files"
 url="http://flac-tools.sourceforge.net/"
diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD
index 08759b92d..54d44e823 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=flam3
 pkgver=3.0.1
 pkgrel=1
 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://flam3.com/"
 license=('GPL3')
 depends=('libjpeg' 'libpng' 'libxml2')
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index 4a3495d02..628c47250 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.9.4
 pkgrel=2
 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
 url="http://www.coreboot.org/Flashrom/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libftdi')
 makedepends=('zlib' 'pciutils')
diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD
index ab25a3240..a61574824 100644
--- a/community/fldiff/PKGBUILD
+++ b/community/fldiff/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fldiff
 pkgver=1.1
 pkgrel=6
 pkgdesc="graphical diff program"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.easysw.com/~mike/fldiff/"
 license=('GPL')
 install=fldiff.install
diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD
index 86fcf0017..1a287da02 100644
--- a/community/flickcurl/PKGBUILD
+++ b/community/flickcurl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=flickcurl
 pkgver=1.21
 pkgrel=3
 pkgdesc="C library for the Flickr API"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://librdf.org/flickcurl/"
 license=('GPL')
 depends=('raptor' 'curl')
diff --git a/community/flightgear-atlas/PKGBUILD b/community/flightgear-atlas/PKGBUILD
index 8cbd7a8ee..ee36ea5ae 100644
--- a/community/flightgear-atlas/PKGBUILD
+++ b/community/flightgear-atlas/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=flightgear-atlas
 pkgver=0.3.1
 pkgrel=3
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="aims to produce and display high quality charts of the world for users of FlightGear."
 depends=('flightgear-data' 'libpng' 'libjpeg')
 makedepends=('simgear')
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index 439e47c9c..54909e46e 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=flightgear
 pkgver=2.4.0
 pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
 makedepends=('boost')
 license=("GPL")
diff --git a/community/flobopuyo/PKGBUILD b/community/flobopuyo/PKGBUILD
index 81c5ecd31..bafe5e88d 100644
--- a/community/flobopuyo/PKGBUILD
+++ b/community/flobopuyo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=flobopuyo
 pkgver=0.20
 pkgrel=5
 pkgdesc="Clone of the famous PuyoPuyo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/$pkgname/"
 license=('GPL')
 depends=('libgl' 'sdl_image' 'sdl_mixer')
diff --git a/community/flowcanvas/PKGBUILD b/community/flowcanvas/PKGBUILD
index ce145f515..913d3ebf9 100644
--- a/community/flowcanvas/PKGBUILD
+++ b/community/flowcanvas/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=flowcanvas
 pkgver=0.7.1
 pkgrel=2
 pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/flowcanvas/"
 depends=('libgnomecanvasmm' 'graphviz')
 makedepends=('boost' 'python2')
diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD
index ae919142d..42c4cd155 100644
--- a/community/floyd/PKGBUILD
+++ b/community/floyd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=floyd
 pkgver=2.0.1
 pkgrel=4
 pkgdesc="displays system load with pulse of keyboard LED"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.asahi-net.or.jp/~pi9s-nnb/floyd/"
 license=("GPL")
 depends=()
diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD
index d3da63100..833e51f00 100644
--- a/community/fltk2/PKGBUILD
+++ b/community/fltk2/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.0
 _pkgver=2.0.x-alpha-r9166
 pkgrel=7
 pkgdesc="Graphical user interface toolkit for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://www.fltk.org/"
 depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama')
diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD
index 5157811c0..37bd3d4c3 100644
--- a/community/flumotion/PKGBUILD
+++ b/community/flumotion/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=flumotion
 pkgver=0.10.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A streaming media server"
 url="http://www.flumotion.net"
 options=('!libtool')
diff --git a/community/fonteditfs/PKGBUILD b/community/fonteditfs/PKGBUILD
index 53ab8d486..b0f6d74fd 100644
--- a/community/fonteditfs/PKGBUILD
+++ b/community/fonteditfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fonteditfs
 pkgver=1.2
 pkgrel=2
 pkgdesc="console font editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fonteditfs.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index 76f92966a..1b8a62b11 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fox
 pkgver=1.6.44
 pkgrel=1
 pkgdesc="Free Objects for X: GUI Toolkit for C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fox-toolkit.org/"
 license=('LGPL' 'custom')
 depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff')
diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD
index e48fffec7..a2bb91007 100644
--- a/community/fpc/PKGBUILD
+++ b/community/fpc/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=fpc
 pkgver=2.6.0
 pkgrel=1
 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freepascal.org/"
 license=('GPL' 'LGPL' 'custom')
 backup=("etc/fpc.cfg")
diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD
index 8cb0333b1..a3dcccc95 100644
--- a/community/freecol/PKGBUILD
+++ b/community/freecol/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=freecol
 pkgver=0.10.3
 pkgrel=1
 pkgdesc="A turn-based strategy game based on Colonization"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freecol.org/"
 license=('GPL')
 depends=('java-runtime')
diff --git a/community/freedroid/PKGBUILD b/community/freedroid/PKGBUILD
index 8b3a38bcf..cb0fb2e7b 100644
--- a/community/freedroid/PKGBUILD
+++ b/community/freedroid/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freedroid
 pkgver=1.0.2
 pkgrel=5
 pkgdesc="a clone of the classic game 'Paradroid' on Commodore 64"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freedroid.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'sdl_image' 'sdl_mixer')
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 2f3a97380..387f78b70 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname='freedroidrpg'
 pkgver=0.15
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
 depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa')
 optdepends=('python2' 'espeak')
diff --git a/community/freehdl/PKGBUILD b/community/freehdl/PKGBUILD
index d0ca0d067..028b94e54 100644
--- a/community/freehdl/PKGBUILD
+++ b/community/freehdl/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.0.8
 _qucsver=0.0.16
 pkgrel=1
 pkgdesc='An open-source (C++ generating) VHDL simulator'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://freehdl.seul.org'
 license=('GPL')
 depends=('gcc-libs' 'libtool' 'perl')
diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index 56cd2ccb4..e80272b38 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=freeimage
 pkgver=3.15.1
 pkgrel=1
 pkgdesc="Library project for developers who would like to support popular graphics image formats."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'custom:FIPL')
 url="http://freeimage.sourceforge.net/"
 depends=('gcc-libs')
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 2609674ba..67a1fa216 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freemat
 pkgver=4.1
 pkgrel=1
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freemat.sourceforge.net"
 license=('GPL')
 depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi')
diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD
index fb5feaa16..849a965c3 100644
--- a/community/freeradius-client/PKGBUILD
+++ b/community/freeradius-client/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freeradius-client
 pkgver=1.1.6
 pkgrel=3
 pkgdesc="FreeRADIUS Client Software"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.freeradius.org/Radiusclient"
 license=('BSD')
 depends=('sh')
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 745c604da..467a9feb2 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freeradius
 pkgver=2.1.12
 pkgrel=3
 pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
 license=("GPL")
 depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam'
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 6c8447953..9a22f7aa4 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freerdp
 pkgver=0.8.2
 pkgrel=3
 pkgdesc="Free RDP client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freerdp.sourceforge.net"
 license=('GPL')
 depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib')
diff --git a/community/freetalk/PKGBUILD b/community/freetalk/PKGBUILD
index ce4fb138d..c3fa25722 100644
--- a/community/freetalk/PKGBUILD
+++ b/community/freetalk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freetalk
 pkgver=3.2
 pkgrel=4
 pkgdesc="A console based Jabber client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/freetalk"
 license=('GPL')
 depends=('loudmouth' 'guile')
diff --git a/community/freevo/PKGBUILD b/community/freevo/PKGBUILD
index c07ec2f34..00530e5e4 100644
--- a/community/freevo/PKGBUILD
+++ b/community/freevo/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=6
 pkgdesc="Freevo is an open-source home theatre PC platform based on Linux and a number of open-source audio/video tools."
 url="http://freevo.sourceforge.net/"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' \
 	 'fbset' 'smpeg' 'pil' 'python-pysqlite-legacy' \
 	 'pyxml' 'lsdvd'  'twisted' 'python2-numpy' 'python-pygame'\
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index 56ec0047c..ba57c7f1e 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freewrl
 pkgver=1.22.10
 pkgrel=7
 pkgdesc="VRML viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freewrl.sourceforge.net/"
 license=('GPL')
 depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox'
diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD
index 3dec10ae0..0abb74191 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=frei0r-plugins
 pkgver=1.3
 pkgrel=2
 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.piksel.org/frei0r"
 license=('GPL')
 depends=('gcc-libs' 'gavl>=1.0.0' 'opencv')
diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD
index 73d890c07..3f8fa34ba 100644
--- a/community/fswebcam/PKGBUILD
+++ b/community/fswebcam/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fswebcam
 pkgver=20110717
 pkgrel=1
 pkgdesc="Tiny and flexible webcam app."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.firestorm.cx/fswebcam"
 license=('GPL')
 depends=('gd')
diff --git a/community/fuseiso/PKGBUILD b/community/fuseiso/PKGBUILD
index 39ee9bffc..359d7f3d1 100644
--- a/community/fuseiso/PKGBUILD
+++ b/community/fuseiso/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fuseiso
 pkgver=20070708
 pkgrel=4
 pkgdesc="FUSE module to mount ISO filesystem images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/fuseiso/"
 license=('GPL')
 depends=('fuse' 'glib2' 'zlib')
diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD
index a4414397b..e233b6a50 100644
--- a/community/fxdesktop/PKGBUILD
+++ b/community/fxdesktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fxdesktop
 pkgver=0.1.12
 pkgrel=3
 pkgdesc="Lightweight Desktop Environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fxdesktop/"
 license=('GPL')
 depends=('fox>=1.6.0' )
diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD
index 4ef1d3f0f..294f7e494 100644
--- a/community/fxprocessview/PKGBUILD
+++ b/community/fxprocessview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fxprocessview
 pkgver=0.5.0
 pkgrel=3
 pkgdesc="Process Viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('fox>=1.4.0')
 url="http://code.google.com/p/fxdesktop/"
diff --git a/community/g2sc/PKGBUILD b/community/g2sc/PKGBUILD
index a026abe98..ee558d366 100644
--- a/community/g2sc/PKGBUILD
+++ b/community/g2sc/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=g2sc
 pkgver=0.2
 pkgrel=3
 pkgdesc="Samba gtk2 client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://sourceforge.net/projects/g2sc"
 depends=('smbclient' 'gtk2')
diff --git a/community/gadmin-samba/PKGBUILD b/community/gadmin-samba/PKGBUILD
index 316fb2624..0b8826e10 100644
--- a/community/gadmin-samba/PKGBUILD
+++ b/community/gadmin-samba/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.3.2
 pkgrel=1
 pkgdesc="An easy to use GTK+ frontend for the SAMBA file and print server"
 url="http://gadmintools.flippedweb.com/index.php?option=com_content&task=view&id=16&Itemid=30"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk2' 'samba')
 replaces=('gsambad')
diff --git a/community/galago-daemon/PKGBUILD b/community/galago-daemon/PKGBUILD
index da038b2c7..259462d17 100644
--- a/community/galago-daemon/PKGBUILD
+++ b/community/galago-daemon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=galago-daemon
 pkgver=0.5.1
 pkgrel=3
 pkgdesc="Galago presence daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.galago-project.org"
 depends=('libgalago')
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index 946e8a1af..4e0bce8ee 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
 pkgver=2.23.1
 pkgrel=6
 pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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'
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 427a2caed..0c1ebb4c6 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
 pkgver=3.0.0
 pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
 license=('GPL')
 groups=('gambas3')
diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD
index 6fcfeab68..e0f5f37ca 100644
--- a/community/gammu/PKGBUILD
+++ b/community/gammu/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gammu
 pkgver=1.31.0
 pkgrel=1
 pkgdesc="GNU All Mobile Management Utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wammu.eu/"
 license=('GPL')
 depends=('bluez' 'curl' 'libmysqlclient'
diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD
index cac38b54a..5934b338e 100644
--- a/community/garmindev/PKGBUILD
+++ b/community/garmindev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=garmindev
 pkgver=0.3.4
 pkgrel=5
 pkgdesc="Garmin Device Drivers for QlandkarteGT"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qlandkarte.org/"
 license=('GPL')
 depends=('libusb')
diff --git a/community/gavl/PKGBUILD b/community/gavl/PKGBUILD
index fefbd6ef5..f578cbe3e 100644
--- a/community/gavl/PKGBUILD
+++ b/community/gavl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gavl
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="A low level library, upon which multimedia APIs can be built."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmerlin.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD
index db977e4d4..045c1f17f 100644
--- a/community/gcc-avr/PKGBUILD
+++ b/community/gcc-avr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gcc-avr
 pkgver=4.6.2
 pkgrel=1
 pkgdesc="The GNU avr Compiler Collection"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'custom')
 url="http://gcc.gnu.org/"
 depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc')
diff --git a/community/gcolor2/PKGBUILD b/community/gcolor2/PKGBUILD
index b9b30a4df..29c03c09a 100644
--- a/community/gcolor2/PKGBUILD
+++ b/community/gcolor2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gcolor2
 pkgver=0.4
 pkgrel=6
 pkgdesc="A simple GTK+2 color selector"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gcolor2.sf.net/"
 license=('GPL')
 depends=('gtk2')
@@ -19,8 +19,9 @@ md5sums=('02de9d925ad5921522685f402caec3ec'
          '9523da11b40dd167964d1b50b40250d5')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	[ "$CARCH" == "x86_64" ] && (patch -p1 < ../gcolor2-0.4-amd64.patch)
+  cd $srcdir/$pkgname-$pkgver
+  [ "$CARCH" == "x86_64" ] && (patch -p1 < ../gcolor2-0.4-amd64.patch)
+  [ "$CARCH" == "mips64el" ] && (patch -p1 < ../gcolor2-0.4-amd64.patch)
 
 	# fix fs#25904
 	sed -i 's/\[:space:\]/[&]/g' configure
diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD
index 5a6bb97ae..2d08b5ec2 100644
--- a/community/gcompris/PKGBUILD
+++ b/community/gcompris/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gcompris
 pkgver=12.01
 pkgrel=1
 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gcompris.net/"
 license=('GPL3')
 depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite'
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 9bf40aea8..ca383e756 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gdal
 pkgver=1.8.0
 pkgrel=6
 pkgdesc="A translator library for raster geospatial data formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD
index ada0fc41c..c9a34153a 100644
--- a/community/gdk-pixbuf/PKGBUILD
+++ b/community/gdk-pixbuf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gdk-pixbuf
 pkgver=0.22.0
 pkgrel=7
 pkgdesc="Image loading and manipulation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL' 'LGPL')
 depends=('gtk' 'libtiff' 'libpng')
diff --git a/community/gdmap/PKGBUILD b/community/gdmap/PKGBUILD
index 6295d89d7..c96091612 100644
--- a/community/gdmap/PKGBUILD
+++ b/community/gdmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdmap
 pkgver=0.8.1
 pkgrel=2
 pkgdesc="Tool to inspect the used space of folders."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gdmap.sourceforge.net"
 license=('GPL')
 depends=('gtk2' 'glib2' 'libxml2')
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index 5efc9f951..297355163 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=geany-plugins
 pkgver=0.21
 pkgrel=2
 pkgdesc="Combined plugins release for Geany"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://plugins.geany.org/"
 license=('GPL')
 depends=('geany' 'lua' 'gtkspell' 'libwebkit' 'hicolor-icon-theme' 'ctpl' 'gpgme')
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index 017d718b2..509b0be3a 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=geany
 pkgver=0.21
 pkgrel=2
 pkgdesc="Fast and lightweight IDE"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.geany.org/"
 license=('GPL')
 depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2')
diff --git a/community/gebabbel/PKGBUILD b/community/gebabbel/PKGBUILD
index 76a1a7e8f..4fdf952ca 100644
--- a/community/gebabbel/PKGBUILD
+++ b/community/gebabbel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gebabbel
 pkgver=0.4
 pkgrel=4
 pkgdesc="GUI for gpsbabel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gebabbel.sourceforge.net/"
 license=('GPL2')
 depends=('qt' 'gpsbabel')
diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD
index 969b1fc76..0db178663 100644
--- a/community/gecko-mediaplayer/PKGBUILD
+++ b/community/gecko-mediaplayer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gecko-mediaplayer
 pkgver=1.0.5
 pkgrel=1
 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/gecko-mediaplayer/'
 license=('GPL')
 depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk')
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index 95408aeea..052da1b58 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=geda-gaf
 pkgver=1.6.2
 pkgrel=1
 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gpleda.org"
 license=('GPL')
 depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme')
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 967663b78..507bd09b0 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gedit-plugins
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Set of plugins for gedit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/GeditPlugins"
 depends=('gedit' 'dbus-python')
diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD
index 70b85e360..9b6efc712 100644
--- a/community/gen2shp/PKGBUILD
+++ b/community/gen2shp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gen2shp
 pkgver=0.3.1
 pkgrel=5
 pkgdesc='Converts ArcInfo generate format to shapefile format'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.intevation.de/~jan/gen2shp/'
 license=('GPL')
 depends=('shapelib')
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD
index aa97623f2..876062876 100644
--- a/community/geos/PKGBUILD
+++ b/community/geos/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=geos
 pkgver=3.3.0
 pkgrel=1
 pkgdesc="A C++ port of the Java Topology Suite"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/geos/"
 license=('LGPL')
 depends=('gcc-libs')
diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD
index f18a19b5a..e5666533a 100644
--- a/community/gerbv/PKGBUILD
+++ b/community/gerbv/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="An open source Gerber file (RS-274X only) viewer"
 url="http://gerbv.gpleda.org/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'shared-mime-info' 'hicolor-icon-theme')
 optdepends=('gdk-pixbuf: export of images' 'cairo: for better graphics')
 install=$pkgname.install
diff --git a/community/ghemical/PKGBUILD b/community/ghemical/PKGBUILD
index a4dc7cb38..718b4823a 100644
--- a/community/ghemical/PKGBUILD
+++ b/community/ghemical/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.0.0
 pkgrel=2
 pkgdesc="Computational chemistry package."
 license=("GPL")
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://bioinformatics.org/ghemical/ghemical/"
 depends=('libghemical>=3.0' 'liboglappth>=1.0' 'libglade' 'gtkglext' 'openbabel')
 makedepends=('pkgconfig' 'intltool>=0.40.0' 'gettext')
diff --git a/community/gigedit/PKGBUILD b/community/gigedit/PKGBUILD
index 9ce2cef8e..dbe6c5f79 100644
--- a/community/gigedit/PKGBUILD
+++ b/community/gigedit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gigedit
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Gigasampler instrument editor"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.linuxsampler.org/"
 license=('GPL')
 depends=('linuxsampler' 'gtkmm' 'libsigc++')
diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index fc69f80fb..c74572d99 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=giggle
 pkgver=0.6.1
 pkgrel=1
 pkgdesc="Git repository viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/giggle"
 license=('GPL')
 depends=('git' 'gtksourceview3' 'vte3')
diff --git a/community/gimmage/PKGBUILD b/community/gimmage/PKGBUILD
index 36b32322a..f4a994d35 100644
--- a/community/gimmage/PKGBUILD
+++ b/community/gimmage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gimmage
 pkgver=0.2.3
 pkgrel=4
 pkgdesc="A gtkmm image viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gimmage.berlios.de"
 license=('GPL')
 depends=('gtkmm' 'curl' 'file')
diff --git a/community/gimp-plugin-fblur/PKGBUILD b/community/gimp-plugin-fblur/PKGBUILD
index 1332871e0..7ce30dac6 100644
--- a/community/gimp-plugin-fblur/PKGBUILD
+++ b/community/gimp-plugin-fblur/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gimp-plugin-fblur
 pkgver=3.2.6
 pkgrel=2
 pkgdesc="Makes out of focus with luminosity and depth"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://registry.gimp.org/node/1444"
 license=('GPL')
 depends=('gimp' 'fftw')
diff --git a/community/gimp-plugin-lqr/PKGBUILD b/community/gimp-plugin-lqr/PKGBUILD
index dc95c85c4..f63da3e06 100644
--- a/community/gimp-plugin-lqr/PKGBUILD
+++ b/community/gimp-plugin-lqr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-plugin-lqr
 pkgver=0.7.1
 pkgrel=3
 pkgdesc="Plugin for The GIMP providing Liquid Rescale"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://liquidrescale.wikidot.com/"
 license=('GPL')
 depends=('gimp' 'liblqr>=0.4.1')
diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD
index cc78ce075..aa74b4ce6 100644
--- a/community/gimp-plugin-mathmap/PKGBUILD
+++ b/community/gimp-plugin-mathmap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-plugin-mathmap
 pkgver=1.3.5
 pkgrel=1
 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.complang.tuwien.ac.at/schani/mathmap/"
 license=('GPL')
 depends=('gimp' 'gsl' 'gtksourceview2' 'fftw' 'giflib')
diff --git a/community/gimp-plugin-wavelet-decompose/PKGBUILD b/community/gimp-plugin-wavelet-decompose/PKGBUILD
index 15fdf6542..1d8355c3b 100644
--- a/community/gimp-plugin-wavelet-decompose/PKGBUILD
+++ b/community/gimp-plugin-wavelet-decompose/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-plugin-wavelet-decompose
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="Wavelet decompose plugin for Gimp"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://registry.gimp.org/node/11742"
 license=('GPL')
 depends=('gimp')
diff --git a/community/gimp-plugin-wavelet-denoise/PKGBUILD b/community/gimp-plugin-wavelet-denoise/PKGBUILD
index 965c516d1..ed22f4c46 100644
--- a/community/gimp-plugin-wavelet-denoise/PKGBUILD
+++ b/community/gimp-plugin-wavelet-denoise/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gimp-plugin-wavelet-denoise
 pkgver=0.3.1
 pkgrel=1
 pkgdesc="Tool to reduce noise in each channel of an image separately"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://registry.gimp.org/node/4235"
 license=('GPL')
 depends=('gimp')
diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD
index b812f13dc..a35c6bf2b 100644
--- a/community/ginac/PKGBUILD
+++ b/community/ginac/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ginac
 pkgver=1.6.2
 pkgrel=1
 pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ginac.de'
 license=('GPL')
 depends=('cln')
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index 1bb606e4e..53f0c8ac6 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=gitg
 pkgver=0.2.5
 pkgrel=1
 pkgdesc='A GIT repository viewer based on GTK+'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://trac.novowork.com/gitg/'
 license=('GPL')
 depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD
index 332336010..1b7db8aaf 100644
--- a/community/gkrellm/PKGBUILD
+++ b/community/gkrellm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gkrellm
 pkgver=2.3.5
 pkgrel=1
 pkgdesc="System monitor package for GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
 license=('GPL3')
 depends=('gtk2' 'openssl' 'libsm' 'lm_sensors')
diff --git a/community/gl-117/PKGBUILD b/community/gl-117/PKGBUILD
index 997649912..5bd83db8d 100644
--- a/community/gl-117/PKGBUILD
+++ b/community/gl-117/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gl-117
 pkgver=1.3.2
 pkgrel=4
 pkgdesc="An action flight simulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.heptargon.de/gl-117/gl-117.html"
 license=("GPL")
 depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi')
diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD
index 8aaa876c0..c35025815 100644
--- a/community/glitz/PKGBUILD
+++ b/community/glitz/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=glitz
 pkgver=0.5.6
 pkgrel=2
 pkgdesc="OpenGL image compositing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cairographics.org/"
 license=('BSD')
 depends=('libgl')
diff --git a/community/gliv/PKGBUILD b/community/gliv/PKGBUILD
index 9875b6eb0..267699f89 100644
--- a/community/gliv/PKGBUILD
+++ b/community/gliv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gliv
 pkgver=1.9.7
 pkgrel=1
 pkgdesc="OpenGL image viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://guichaz.free.fr/gliv/"
 license=('GPL')
 depends=('gtkglext')
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 900518957..7e64bd13d 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=glob2
 pkgver=0.9.4.4
 pkgrel=10
 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.globulation2.org/"
 license=('GPL3')
 depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa'
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index fab10c6bb..b30e99470 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=glom
 pkgver=1.20.1
 pkgrel=1
 pkgdesc="An easy-to-use database designer and user interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glom.org/"
 license=('GPL')
 depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index df4c6569a..c20c168d2 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gloox
 pkgver=1.0
 pkgrel=2
 pkgdesc="C++ libraries for development of Jabber client/component/server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://camaya.net/gloox"
 options=('!libtool')
 license=("GPL")
diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD
index 0c57c67ae..d1fe5160f 100644
--- a/community/glpng/PKGBUILD
+++ b/community/glpng/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glpng
 pkgver=1.45
 pkgrel=4
 pkgdesc="Toolkit for loading PNG images as OpenGL textures"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fifi.org/doc/libglpng-dev/glpng.html"
 license=('custom')
 depends=('libpng' 'libgl')
diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD
index b16442551..6668ed55e 100644
--- a/community/gluon/PKGBUILD
+++ b/community/gluon/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.71.0
 _pkgver=0.71
 pkgrel=3
 pkgdesc="A free and open source platform for creating and distributing games"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gluon.gamingfreedom.org/"
 license=('LGPL')
 depends=('qt' 'kdebase-runtime' 'libsndfile' 'openal' 'alure' 'attica')
diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD
index dbdc62f80..6fb9678e4 100644
--- a/community/gmerlin-avdecoder/PKGBUILD
+++ b/community/gmerlin-avdecoder/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gmerlin-avdecoder
 pkgver=1.1.0
 pkgrel=3
 pkgdesc="Media decoding library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmerlin.sourceforge.net/avdec_frame.html"
 license=('GPL')
 depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex'
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index adb56b50c..f0a9c65c5 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gmerlin
 pkgver=1.0.0
 pkgrel=4
 pkgdesc="Multimedia architecture for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
 depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools')
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ccfbf4d53..b55fbfeac 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('gmic' 'gimp-plugin-gmic')
 pkgver=1.5.0.8
 pkgrel=1
 pkgdesc="image procession framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:CeCILL')
 url="http://gmic.sourceforge.net"
 makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
diff --git a/community/gmime22/PKGBUILD b/community/gmime22/PKGBUILD
index 12d5d75df..29233ed33 100644
--- a/community/gmime22/PKGBUILD
+++ b/community/gmime22/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmime22
 pkgver=2.2.26
 pkgrel=1
 pkgdesc="Core mime parsing library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://spruce.sourceforge.net/gmime/"
 depends=('glib2' 'zlib')
diff --git a/community/gmrun/PKGBUILD b/community/gmrun/PKGBUILD
index d5d961018..eb04be66c 100644
--- a/community/gmrun/PKGBUILD
+++ b/community/gmrun/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmrun
 pkgver=0.9.2
 pkgrel=3
 pkgdesc="A simple program which provides a run program window"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sf.net/projects/gmrun"
 license=('GPL')
 depends=('gtk2' 'popt')
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index df42c396b..4c27cb953 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.9
 pkgrel=8
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
 makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 6ca662aec..ec1bda143 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnome-commander
 pkgver=1.2.8.15
 pkgrel=1
 pkgdesc="A graphical two-pane filemanager for Gnome"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/gcmd/"
 license=('GPL')
 depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD
index a160d8579..1c8a08716 100644
--- a/community/gnome-mplayer/PKGBUILD
+++ b/community/gnome-mplayer/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnome-mplayer
 pkgver=1.0.5
 pkgrel=1
 pkgdesc='A simple MPlayer GUI.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gnome-mplayer.googlecode.com/'
 license=('GPL')
 depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk')
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index e931a5402..e24803a9c 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-packagekit
 pkgver=3.2.1
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.packagekit.org/'
 license=('GPL')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
diff --git a/community/gnome-ppp/PKGBUILD b/community/gnome-ppp/PKGBUILD
index 7b8c94ae3..35c27216c 100644
--- a/community/gnome-ppp/PKGBUILD
+++ b/community/gnome-ppp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-ppp
 pkgver=0.3.23
 pkgrel=7
 pkgdesc="A GNOME 2 WvDial frontend"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnomefiles.org/app.php?soft_id=41"
 license=('GPL2')
 depends=('libglade' 'wvdial')
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index ba1159032..47cfe0b7b 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=$_pkgname-updates
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL')
 depends=('gnome-packagekit' "$_pkgname")
diff --git a/community/gnomesu/PKGBUILD b/community/gnomesu/PKGBUILD
index 3cfd444da..89a456fa4 100644
--- a/community/gnomesu/PKGBUILD
+++ b/community/gnomesu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnomesu
 pkgver=0.3.1
 pkgrel=6
 pkgdesc="A program that allows a user to su to root in a Gnome environment."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtkfiles.org/app.php/GnomeSu"
 license=("GPL")
 depends=('libgnomeui' 'libzvt')
diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD
index e19e97b99..f09a5e788 100644
--- a/community/gnonlin/PKGBUILD
+++ b/community/gnonlin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnonlin
 pkgver=0.10.16
 pkgrel=1
 pkgdesc="A library for creating non-linear video editors"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnonlin.sourceforge.net"
 depends=('gstreamer0.10>=0.10.30')
 makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.30' 'pkgconfig')
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index fff5fe176..eed8cc5e4 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnote
 pkgver=0.8.2
 pkgrel=1
 pkgdesc="A note taking application."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Gnote"
 license=('GPL3')
 depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD
index 2ebd79695..10f6fa42f 100644
--- a/community/gnubiff-gtk/PKGBUILD
+++ b/community/gnubiff-gtk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnubiff-gtk
 pkgver=2.2.13
 pkgrel=3
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
 depends=('libglade' 'openssl' 'popt')
diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD
index 5dd567d8a..65b80b55c 100644
--- a/community/gnubiff/PKGBUILD
+++ b/community/gnubiff/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnubiff
 pkgver=2.2.13
 pkgrel=2
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
 depends=('libglade' 'gtk2' 'popt')
diff --git a/community/gnucap/PKGBUILD b/community/gnucap/PKGBUILD
index 1b9e4fec5..7c92073d1 100644
--- a/community/gnucap/PKGBUILD
+++ b/community/gnucap/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=20091207
 _pkgver=2009-12-07
 pkgrel=2
 pkgdesc="GNU Circuit Analysis Package"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnucap.org/"
 license=('GPL')
 depends=('gcc-libs' 'readline')
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index 2fee0c8bb..69c9df902 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnunet-gtk
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="A frontend for GNUnet"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
 options=('!libtool')
 license=('GPL')
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index fa60b32b3..8cf2333a6 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnunet
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="A framework for secure peer-to-peer networking"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
 license=('GPL')
 depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'curl' 'libmicrohttpd')
diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD
index 13d59afeb..b7402377d 100644
--- a/community/gnustep-back/PKGBUILD
+++ b/community/gnustep-back/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-back
 pkgver=0.20.1
 pkgrel=1
 pkgdesc="The GNUstep GUI Backend"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
 license=('LGPL')
 depends=(libgl libxmu gcc-libs freetype2 libart-lgpl)
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index f5ddf08ff..eca6580d0 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-base
 pkgver=1.23.0
 pkgrel=1
 pkgdesc="The GNUstep base package"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
 license=("GPL" "LGPL")
 depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls)
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index 624656ee9..e0b00efca 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-gui
 pkgver=0.20.0
 pkgrel=2
 pkgdesc="The GNUstep GUI class library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
 license=('LGPL')
 depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 24eda6252..cacbd5519 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=r60.3
 pkgrel=2
 epoch=1
 pkgdesc='Google Go compiler and tools (release version)'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://golang.org/"
 license=('custom')
 depends=('perl' 'ed')
diff --git a/community/gobby/PKGBUILD b/community/gobby/PKGBUILD
index c371380c0..66a3a79cd 100644
--- a/community/gobby/PKGBUILD
+++ b/community/gobby/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gobby
 pkgver=0.4.12
 pkgrel=2
 pkgdesc="A collaborative text editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de"
 license=('GPL')
 
diff --git a/community/gocr/PKGBUILD b/community/gocr/PKGBUILD
index e7e5386fe..846f0aa10 100644
--- a/community/gocr/PKGBUILD
+++ b/community/gocr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gocr
 pkgver=0.49
 pkgrel=1
 pkgdesc="Open-source character recognition (OCR)"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://jocr.sourceforge.net/index.html"
 license=('GPL')
 depends=('glibc' 'netpbm')
diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD
index b12b6959c..0ac84d861 100644
--- a/community/gogglesmm/PKGBUILD
+++ b/community/gogglesmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gogglesmm
 pkgver=0.12.6
 pkgrel=1
 pkgdesc="Music Manager and Player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/gogglesmm/"
 license=('GPL3')
 install=gogglesmm.install
diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD
index 0d3796329..5ff50b09a 100644
--- a/community/goldendict/PKGBUILD
+++ b/community/goldendict/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=goldendict
 pkgver=1.0.1
 pkgrel=5
 pkgdesc="Feature-rich dictionary lookup program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goldendict.berlios.de/"
 license=('GPL3')
 depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon')
diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index 332b93004..b7812f256 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=goocanvas
 pkgver=2.0.1
 pkgrel=1
 pkgdesc="A cairo canvas widget for GTK+"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/GooCanvas"
 options=('!libtool' 'docs')
 license=("LGPL")
diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD
index e44d3e6a9..5fd36fbb9 100755
--- a/community/goocanvasmm/PKGBUILD
+++ b/community/goocanvasmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=goocanvasmm
 pkgver=1.90.8
 pkgrel=1
 pkgdesc='C++ wrappers for goocanvas'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/'
 license=('GPL')
 depends=('goocanvas' 'gtkmm3')
diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD
index ad1ce8ab6..21e2e2b7a 100644
--- a/community/google-gadgets/PKGBUILD
+++ b/community/google-gadgets/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.11.2
 _sover=1.0
 _sobump=0.0.0
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/google-gadgets-for-linux/"
 license=('APACHE')
 makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index 63e0ee8e5..b69c85d59 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.37
 pkgrel=1
 pkgdesc="software version control visualization"
 license=(GPL3)
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url=http://code.google.com/p/gource/
 depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew')
 source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index ff5f9784e..06b3b1c50 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpac
 pkgver=3824
 pkgrel=1
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gpac.sourceforge.net"
 license=('LGPL')
 depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa')
diff --git a/community/gpg-crypter/PKGBUILD b/community/gpg-crypter/PKGBUILD
index 88787c6d0..2bd83c169 100644
--- a/community/gpg-crypter/PKGBUILD
+++ b/community/gpg-crypter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpg-crypter
 pkgver=0.3.5
 pkgrel=4
 pkgdesc="A graphical front-end to GnuPG(GPG) using the GTK2 toolkit and libgpgme"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gpg-crypter.sourceforge.net/"
 license=('GPL')
 depends=('gtk2' 'gpgme')
diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD
index 08cb64110..6739ade04 100644
--- a/community/gphpedit/PKGBUILD
+++ b/community/gphpedit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gphpedit
 pkgver=0.9.98RC1
 pkgrel=2
 pkgdesc="a scintilla/gnome based editor specialized on php-files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils' 'libwebkit')
 makedepends=('intltool')
diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD
index f09f60b3e..080e5ba07 100644
--- a/community/gpicview/PKGBUILD
+++ b/community/gpicview/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpicview
 pkgver=0.2.2
 pkgrel=1
 pkgdesc="Picture viewer of the LXDE Desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD
index 6d4f0c2b5..badc9b5c5 100644
--- a/community/gprolog/PKGBUILD
+++ b/community/gprolog/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gprolog
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="GNU Prolog"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gprolog.org/"
 depends=('glibc')
 license=('GPL')
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index 4a03c8930..8bc7333ad 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpsbabel
 pkgver=1.4.2
 pkgrel=4
 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gpsbabel.org"
 license=('GPL')
 depends=('libusb-compat' 'expat')
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index 2b66a8418..3cf91b2a1 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpsdrive
 pkgver=2.11
 pkgrel=11
 pkgdesc="A car (bike, ship, plane) navigation system"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://www.gpsdrive.de/"
 license=('GPL2')
 depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD
index 809a2b973..c6b8536ca 100644
--- a/community/gpsim/PKGBUILD
+++ b/community/gpsim/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gpsim
 pkgver=0.26.1
 pkgrel=1
 pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://gpsim.sourceforge.net/"
 license=(GPL)
 depends=('gtk2+extra' 'popt')
diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD
index 36e723e7e..66ee0e9d6 100644
--- a/community/gpsmanshp/PKGBUILD
+++ b/community/gpsmanshp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpsmanshp
 pkgver=1.2
 pkgrel=4
 pkgdesc='A Tcl package to read and write shapefiles'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ncc.up.pt/gpsmanshp'
 license=('GPL')
 depends=('bash' 'tcl' 'shapelib')
diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD
index 4b0695154..a5e1c2d3e 100644
--- a/community/gputils/PKGBUILD
+++ b/community/gputils/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gputils
 pkgver=0.14.1
 pkgrel=1
 pkgdesc="PIC Programming Utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gputils.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/gq/PKGBUILD b/community/gq/PKGBUILD
index fe5382f8b..c690cd1c7 100644
--- a/community/gq/PKGBUILD
+++ b/community/gq/PKGBUILD
@@ -10,7 +10,7 @@ url="http://sourceforge.net/projects/gqclient"
 license=("GPL")
 depends=('libxml2' 'gtk2' 'libgnome-keyring' 'libglade' 'libldap>=2.4.18' 'libgpg-error' 'libgcrypt')
 makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 install=gq.install
 source=(http://downloads.sourceforge.net/sourceforge/gqclient/$pkgname-$pkgver.tar.gz)
 md5sums=('d7b1e183a3ecbd77aceea02d27f36b3e')
diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD
index 3a74d0fb0..cbcc79361 100644
--- a/community/grace/PKGBUILD
+++ b/community/grace/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=grace
 pkgver=5.1.22
 pkgrel=5
 pkgdesc="2D plotting tool"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://plasma-gate.weizmann.ac.il/Grace/"
 depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf')
 makedepends=('netcdf' 'fftw')
diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD
index c1d2aad71..bd12228fd 100644
--- a/community/grsync/PKGBUILD
+++ b/community/grsync/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=grsync
 pkgver=1.2.1
 pkgrel=1
 pkgdesc="GTK GUI for rsync"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.opbyte.it/grsync"
 license=('GPL')
 depends=('gtk2' 'rsync')
diff --git a/community/gsasl/PKGBUILD b/community/gsasl/PKGBUILD
index 60f87df16..21f8e330a 100644
--- a/community/gsasl/PKGBUILD
+++ b/community/gsasl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gsasl
 pkgver=1.6.1
 pkgrel=3
 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://josefsson.org/gsasl/"
 license=("GPL")
 depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
diff --git a/community/gshutdown/PKGBUILD b/community/gshutdown/PKGBUILD
index 8bd709fb7..0279babbb 100644
--- a/community/gshutdown/PKGBUILD
+++ b/community/gshutdown/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gshutdown
 pkgver=0.2
 pkgrel=3
 pkgdesc="An advanced shutdown utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gshutdown.tuxfamily.org"
 license=('GPL')
 depends=('libglade' 'libnotify')
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index 2a4035393..d38635150 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gsmartcontrol
 pkgver=0.8.6
 pkgrel=2
 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
 license=('GPL3')
 depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index 0e8d448c8..cbb837564 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.8.6
 pkgrel=1
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'custom')
 depends=('openssl' 'zlib' 'gcc-libs')
 makedepends=('autoconf' 'automake')
diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD
index 88d05ff87..155914731 100644
--- a/community/gsql/PKGBUILD
+++ b/community/gsql/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="Integrated database development tool for GNOME"
 url="http://gsql.org/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf'
 	 'desktop-file-utils' 'libnotify')
 makedepends=('libmysqlclient' 'postgresql-libs' 'libssh')
diff --git a/community/gstm/PKGBUILD b/community/gstm/PKGBUILD
index 985683dbe..b798a12c5 100644
--- a/community/gstm/PKGBUILD
+++ b/community/gstm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gstm
 pkgver=1.2
 pkgrel=2
 pkgdesc="Gnome front-end to ssh tunneling"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/gstm/"
 license=('GPL')
 depends=('libgnomeui')
diff --git a/community/gstreamermm/PKGBUILD b/community/gstreamermm/PKGBUILD
index f546bc455..fe63cb019 100644
--- a/community/gstreamermm/PKGBUILD
+++ b/community/gstreamermm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamermm
 pkgver=0.10.10
 pkgrel=1
 pkgdesc="C++ interface for GStreamer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
 license=('LGPL')
 depends=('glibmm' 'gstreamer0.10-base>=0.10.25' 'libsigc++2.0' 'libxml++')
diff --git a/community/gsynaptics/PKGBUILD b/community/gsynaptics/PKGBUILD
index 137235be1..78919e90e 100644
--- a/community/gsynaptics/PKGBUILD
+++ b/community/gsynaptics/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gsynaptics
 pkgver=0.9.16
 pkgrel=2
 pkgdesc="A settings tool for Synaptics touchpad driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gsynaptics.sourceforge.jp/"
 license=('GPL')
 depends=('libgnomeui' 'synaptics')
diff --git a/community/gtk-aurora-engine/PKGBUILD b/community/gtk-aurora-engine/PKGBUILD
index 61f67e87b..8ec53e4aa 100644
--- a/community/gtk-aurora-engine/PKGBUILD
+++ b/community/gtk-aurora-engine/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk-aurora-engine
 pkgver=1.5.1
 pkgrel=2
 pkgdesc="gtk-engine: latest member of the clearlooks family"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome-look.org/content/show.php/Aurora+Gtk+Engine?content=56438"
 license=('GPL')
 depends=('gtk2')
diff --git a/community/gtk-chtheme/PKGBUILD b/community/gtk-chtheme/PKGBUILD
index 5621dce39..254c97094 100644
--- a/community/gtk-chtheme/PKGBUILD
+++ b/community/gtk-chtheme/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk-chtheme
 pkgver=0.3.1
 pkgrel=6
 pkgdesc="This little program lets you change your Gtk+ 2.0 theme. A better alternative to switch2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://plasmasturm.org/programs/gtk-chtheme/"
 depends=('gtk2')
diff --git a/community/gtk-engine-murrine/PKGBUILD b/community/gtk-engine-murrine/PKGBUILD
index b14fa5f7f..2d0470f06 100644
--- a/community/gtk-engine-murrine/PKGBUILD
+++ b/community/gtk-engine-murrine/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gtk-engine-murrine
 pkgver=0.98.1.1
 pkgrel=2
 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')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cimitan.com/murrine/project/murrine"
 license=('LGPL3')
 depends=('gtk2')
diff --git a/community/gtk-kde4/PKGBUILD b/community/gtk-kde4/PKGBUILD
index 367b79207..9891313ae 100644
--- a/community/gtk-kde4/PKGBUILD
+++ b/community/gtk-kde4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk-kde4
 pkgver=0.9.5b
 pkgrel=2
 pkgdesc='Allows you to change style, icons, font of GTK applications in KDE4.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kde-look.org/content/show.php?content=74689'
 license=('GPL')
 depends=('kdebase-workspace' 'gtk-engines')
diff --git a/community/gtk-theme-switch2/PKGBUILD b/community/gtk-theme-switch2/PKGBUILD
index a5b6b1015..9f4eb22d9 100644
--- a/community/gtk-theme-switch2/PKGBUILD
+++ b/community/gtk-theme-switch2/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.1.0
 pkgrel=1
 pkgdesc="Gtk2 theme switcher"
 url="http://muhri.net/nav.php3?node=gts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('gtk2')
 source=(http://ftp.de.debian.org/debian/pool/main/g/gtk-theme-switch/gtk-theme-switch_${pkgver}.orig.tar.gz)
diff --git a/community/gtk2+extra/PKGBUILD b/community/gtk2+extra/PKGBUILD
index 0ade4d067..f1dcb0925 100644
--- a/community/gtk2+extra/PKGBUILD
+++ b/community/gtk2+extra/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk2+extra
 pkgver=2.1.2
 pkgrel=1
 pkgdesc="GtkExtra is a useful set of widgets for creating GUI's for the Xwindows system using GTK+"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://gtkextra.sourceforge.net/"
 depends=('gtk2')
 license=('LGPL')
diff --git a/community/gtk2_prefs/PKGBUILD b/community/gtk2_prefs/PKGBUILD
index 33ac8a409..a968563a9 100644
--- a/community/gtk2_prefs/PKGBUILD
+++ b/community/gtk2_prefs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtk2_prefs
 pkgver=0.4.1
 pkgrel=2
 pkgdesc="A GTK2 theme selector and font switcher"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtk-win.sourceforge.net/home/index.php/en/Gtk2Prefs"
 license=("GPL")
 depends=('gtk2')
diff --git a/community/gtk2fontsel/PKGBUILD b/community/gtk2fontsel/PKGBUILD
index 9cabdf360..84e71b52a 100644
--- a/community/gtk2fontsel/PKGBUILD
+++ b/community/gtk2fontsel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk2fontsel
 pkgver=0.1
 pkgrel=3
 pkgdesc="Font selection and preview tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtk2fontsel.sourceforge.net/"
 license=('GPL')
 depends=('gtk2')
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index f6968e962..327d7ad40 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('ghc' 'alex' 'happy')
 depends=('gmp')
 options=('strip')
diff --git a/community/gtkballs/PKGBUILD b/community/gtkballs/PKGBUILD
index 7dad82a94..0185aeaa1 100644
--- a/community/gtkballs/PKGBUILD
+++ b/community/gtkballs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkballs
 pkgver=3.1.5
 pkgrel=4
 pkgdesc="clone of Lines - logic game about balls"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkballs.antex.ru/"
 license=('GPL')
 depends=("gtk2")
diff --git a/community/gtkdatabox/PKGBUILD b/community/gtkdatabox/PKGBUILD
index e053f5ce9..c8b52ad00 100644
--- a/community/gtkdatabox/PKGBUILD
+++ b/community/gtkdatabox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkdatabox
 pkgver=0.9.0.1
 pkgrel=2
 pkgdesc="A widget for the Gtk+ library designed to display large amounts of numerical data"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.eudoxos.net/gtk/gtkdatabox"
 options=('!libtool')
 license=("LGPL")
diff --git a/community/gtkdialog/PKGBUILD b/community/gtkdialog/PKGBUILD
index 4dc062315..ec5a6197f 100644
--- a/community/gtkdialog/PKGBUILD
+++ b/community/gtkdialog/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkdialog
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="Gtkdialog is a small utility for fast and easy GUI building."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #url="http://linux.pte.hu/~pipas/gtkdialog/"
 url="http://code.google.com/p/gtkdialog/"
 license=("GPL")
diff --git a/community/gtkperf/PKGBUILD b/community/gtkperf/PKGBUILD
index 88f6beb80..614e1a4c6 100644
--- a/community/gtkperf/PKGBUILD
+++ b/community/gtkperf/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gtkperf
 pkgver=0.40
 pkgrel=3
 pkgdesc="An application designed to test GTK+ performance"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkperf.sourceforge.net"
 license=("GPL")
 depends=('gtk2')
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 86db9c11c..55cdd5758 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkwave
 pkgver=3.3.30
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gtkwave.sourceforge.net'
 license=('GPL' 'MIT')
 depends=('bzip2' 'xz' 'gtk2')
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index b22836bc7..7ebff81e4 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtranslator
 pkgver=2.90.7
 pkgrel=1
 pkgdesc="An enhanced gettext po file editor for the GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gtranslator/"
 license=('GPL')
 depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda4' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index ae82be66a..d2be5f0e7 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtypist
 pkgver=2.9.1
 pkgrel=1
 pkgdesc="universal typing tutor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gtypist/gtypist.html"
 license=("GPL")
 depends=('ncurses' 'perl')
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index 96bc8f472..91e7a7333 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=guake
 pkgver=0.4.2
 pkgrel=4
 pkgdesc='is a drop-down terminal for Gnome Desktop Environment'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://guake-terminal.org'
 license=('GPL')
 depends=('python-notify' 'vte' 'gconf' 'python2-gconf' 'dbus-python' 'notification-daemon')
diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD
index 787656283..fe5467a56 100644
--- a/community/guichan/PKGBUILD
+++ b/community/guichan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=guichan
 pkgver=0.8.2
 pkgrel=2
 pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://guichan.sourceforge.net/"
 license=('BSD')
 makedepends=('sdl_image' 'allegro' 'libgl' 'glut')
diff --git a/community/guifications/PKGBUILD b/community/guifications/PKGBUILD
index f89cc9268..94a0683b9 100644
--- a/community/guifications/PKGBUILD
+++ b/community/guifications/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=guifications
 pkgver=2.16
 pkgrel=3
 pkgdesc="A set of GUI popup notifications for pidgin"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://plugins.guifications.org/trac/wiki/Guifications"
 license=("GPL")
 depends=('pidgin')
diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD
index a7d2e215c..e62b110a6 100644
--- a/community/gummi/PKGBUILD
+++ b/community/gummi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gummi
 pkgver=0.6.1
 pkgrel=1
 pkgdesc='Simple LaTex editor for GTK users'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gummi.midnightcoding.org/'
 license=('MIT')
 depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib')
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 505ac1309..86bc51c37 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gwenhywfar
 pkgver=4.3.1
 pkgrel=1
 pkgdesc="OS abstraction functions for various projects"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.aquamaniac.de"
 options=('!libtool')
 license=("LGPL")
diff --git a/community/gxmessage/PKGBUILD b/community/gxmessage/PKGBUILD
index 5a91a2e14..4c964485f 100644
--- a/community/gxmessage/PKGBUILD
+++ b/community/gxmessage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gxmessage
 pkgver=2.12.4
 pkgrel=1
 pkgdesc="A GTK2 based xmessage clone."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
 license=('GPL')
 depends=('gtk2' 'desktop-file-utils')
diff --git a/community/hacburn/PKGBUILD b/community/hacburn/PKGBUILD
index 2c4ea446e..42d7a1eb0 100644
--- a/community/hacburn/PKGBUILD
+++ b/community/hacburn/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=hacburn
 pkgver=0.3.5
 pkgrel=4
 pkgdesc="HacBurn is a script written in perl to aid in writing CDs. It is a graphical interface (using gtk+) to cdrtools, mpg321 and ogg123."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hacburn.sourceforge.net/"
 license=('GPL')
 depends=('gtk2-perl' 'glib-perl' 'cdrkit' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame')
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 92b3bec3e..428053719 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=4
 pkgdesc="Tool for generating documentation for Haskell libraries"
 url="http://hackage.haskell.org/package/$pkgname"
 license=('custom:BSD3')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('alex' 'happy')
 depends=('ghc' 'haskell-mtl' 'haskell-xhtml>=3000.2' 'haskell-ghc-paths') 
 options=(strip)
diff --git a/community/hashcash/PKGBUILD b/community/hashcash/PKGBUILD
index f77b2f304..24ba4a3bf 100644
--- a/community/hashcash/PKGBUILD
+++ b/community/hashcash/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hashcash
 pkgver=1.22
 pkgrel=2
 pkgdesc="a denial-of-service counter measure tool for email/spam."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hashcash.org"
 license=('GPL')
 depends=( 'glibc' )
diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD
index ae5bcab42..fd76ca872 100644
--- a/community/haskell-binary/PKGBUILD
+++ b/community/haskell-binary/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=8
 pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
 url="http://hackage.haskell.org/package/binary"
 license=('custom:BSD3')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index cd94ed17c..7ea26e610 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3.2
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/community/haskell-dbus/PKGBUILD b/community/haskell-dbus/PKGBUILD
index 316df37f3..0d02869ec 100644
--- a/community/haskell-dbus/PKGBUILD
+++ b/community/haskell-dbus/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="DBus bindings"
 url="http://hackage.haskell.org/package/DBus"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3' 'sh')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/DBus/0.4/DBus-0.4.tar.gz
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index e90cf6dc0..d66585d8c 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=5
 pkgdesc="Knowledge of GHC's installation directories"
 url="http://hackage.haskell.org/package/ghc-paths"
 license=('custom:BSD3')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=()
 depends=(ghc=7.0.3-2)
 options=('strip')
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index 5a6124fd3..f5759bb83 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2.2
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 8b58c7f3e..ad7e5aaa5 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
 options=('strip')
 install=${pkgname}.install
@@ -22,7 +22,7 @@ build() {
 	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
 	--enable-library-profiling
   runhaskell Setup build
-  runhaskell Setup haddock
+  RUnhaskell Setup haddock
   runhaskell Setup register   --gen-script
   runhaskell Setup unregister --gen-script
   sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
diff --git a/community/haskell-mmap/PKGBUILD b/community/haskell-mmap/PKGBUILD
index b1002be46..3848c500b 100644
--- a/community/haskell-mmap/PKGBUILD
+++ b/community/haskell-mmap/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=3.2
 pkgdesc="Memory mapped files for POSIX and Windows"
 url="http://hackage.haskell.org/package/mmap"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 401074d56..3dd8401a0 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=5
 pkgdesc="Reading, writing and manipulating \".tar\" archive files."
 url="http://hackage.haskell.org/package/tar"
 license=('custom:BSD3')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index 51e968853..3ae8d8635 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=4.2
 pkgdesc="Haskell bindings to the terminfo library."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index e6d27dfad..e92e71f0a 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=7.2
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index 871e0306f..4a35ea0b3 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.6-7.2' 'libxft')
 options=('strip')
 install=haskell-x11-xft.install
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 445c8ddd1..60a60b930 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=haskell-x11
 pkgver=1.5.0.1
 pkgrel=1
 pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD
index d0250b55b..564c9888f 100644
--- a/community/hatari/PKGBUILD
+++ b/community/hatari/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hatari
 pkgver=1.5.0
 pkgrel=1
 pkgdesc='An Atari ST and STE emulator'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://hatari.sourceforge.net/'
 license=('GPL')
 depends=('sdl' 'libpng')
diff --git a/community/hawknl/PKGBUILD b/community/hawknl/PKGBUILD
index ab40d900f..a3f53d04f 100644
--- a/community/hawknl/PKGBUILD
+++ b/community/hawknl/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=hawknl
 pkgver=1.68
 pkgrel=2
 pkgdesc="An open source game oriented network API"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hawksoft.com/hawknl/"
 license=('LGPL')
 depends=('glibc')
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 6958d81df..18ff0d9c4 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hedgewars
 pkgver=0.9.17
 pkgrel=1
 pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
 depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
diff --git a/community/hevea/PKGBUILD b/community/hevea/PKGBUILD
index d1d9e3136..5361fcfd9 100644
--- a/community/hevea/PKGBUILD
+++ b/community/hevea/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=hevea
 pkgver=1.10
 pkgrel=2
 pkgdesc="A quite complete and fast LATEX to HTML translator"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('ocaml')
 license=('GPL')
 url="http://pauillac.inria.fr/~maranget/hevea/"
diff --git a/community/hex-a-hop/PKGBUILD b/community/hex-a-hop/PKGBUILD
index aeda535bc..31a4276db 100644
--- a/community/hex-a-hop/PKGBUILD
+++ b/community/hex-a-hop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hex-a-hop
 pkgver=1.1.0
 pkgrel=2
 pkgdesc='Hex-a-hop is a puzzle game based on hexagonal tiles'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://hexahop.sourceforge.net/'
 license=('GPL')
 depends=('sdl_mixer' 'sdl_ttf' 'gcc-libs')
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 230900634..0644c49c9 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.7
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=(qt lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2)
 md5sums=('dab2d059f4115b5ac0b5d329401d883b')
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index 34875c7c9..1eca6b521 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=homebank
 pkgver=4.4
 pkgrel=1
 pkgdesc="Free, easy, personal accounting for everyone"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://homebank.free.fr/"
 license=('GPL')
 depends=('desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'libofx' 'librsvg' 'perlxml' 'shared-mime-info')
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 507b7c3f7..8a9458dd2 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hostapd
 pkgver=0.7.3
 pkgrel=5
 pkgdesc="daemon for wireless software access points"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hostap.epitest.fi/hostapd/"
 license=('custom')
 depends=('openssl' 'libnl')
diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD
index ee6b4e835..7c9e8e04e 100644
--- a/community/hping/PKGBUILD
+++ b/community/hping/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hping
 pkgver=3.0.0
 pkgrel=2
 pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.hping.org'
 license=('GPL2' 'BSD')
 depends=('libpcap')
diff --git a/community/hsetroot/PKGBUILD b/community/hsetroot/PKGBUILD
index e6b8b4992..eb1f3ac85 100644
--- a/community/hsetroot/PKGBUILD
+++ b/community/hsetroot/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc='A tool which allows you to compose wallpapers for X.'
 url='http://www.thegraveyard.org/hsetroot.php'
 license=('GPL')
 depends=('imlib2' 'xorg-server')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.thegraveyard.org/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('f599770a6411dcfe216c37b280fad9bc')
 
diff --git a/community/hsolink/PKGBUILD b/community/hsolink/PKGBUILD
index 0f496da75..81c10eb95 100644
--- a/community/hsolink/PKGBUILD
+++ b/community/hsolink/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hsolink
 pkgver=1.0.118
 pkgrel=7
 pkgdesc="HSO command line connection utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pharscape.org/hsolinkcontrol.html"
 license=('GPL2')
 depends=('ozerocdoff' 'net-tools')
diff --git a/community/ht/PKGBUILD b/community/ht/PKGBUILD
index d7360a824..b47198e0e 100644
--- a/community/ht/PKGBUILD
+++ b/community/ht/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ht
 pkgver=2.0.18
 pkgrel=1
 pkgdesc="A file editor/viewer/analyzer for executables"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hte.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs' 'ncurses' 'lzo2')
diff --git a/community/html2text/PKGBUILD b/community/html2text/PKGBUILD
index 38fee9ebe..0a418b15b 100644
--- a/community/html2text/PKGBUILD
+++ b/community/html2text/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=html2text
 pkgver=1.3.2a
 pkgrel=9
 pkgdesc="A HTML to text converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mbayer.de/html2text"
 license=('GPL2')
 depends=('gcc-libs')
diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD
index ded19e284..d057cdeb0 100644
--- a/community/htmldoc/PKGBUILD
+++ b/community/htmldoc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=htmldoc
 pkgver=1.8.27
 pkgrel=6
 pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.htmldoc.org"
 license=('GPL')
 depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm')
diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD
index dad2e7b9a..1d923e6de 100644
--- a/community/httptunnel/PKGBUILD
+++ b/community/httptunnel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=httptunnel
 pkgver=3.3
 pkgrel=3
 pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nocrew.org/software/httptunnel"
 license=('GPL2')
 depends=('glibc')
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index cf1651064..2ec9ba308 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hubbub
 pkgver=0.1.1
 pkgrel=2
 pkgdesc="HTML5 compliant parsing library"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/hubbub/"
 license=('MIT')
 depends=('libparserutils')
diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 28e2ea582..cc0fdb7d7 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=hwinfo
 pkgver=19.0
 pkgrel=2
 pkgdesc='Hardware detection tool from openSUSE'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opensuse.org/'
 license=('GPL2')
 depends=('perl' 'libx86emu')
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 57e3065dc..0a2ae1e12 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -6,7 +6,7 @@ _pkgsourcename=i3
 pkgver=4.1.1
 pkgrel=1
 pkgdesc="An improved dynamic tiling window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/"
 license=('BSD')
 replaces=("i3" "i3bar")
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index a480fb878..593c314cc 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=i3lock
 pkgver=2.2
 pkgrel=2
 pkgdesc="An improved screenlocker based upon XCB and PAM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index b5ddcb649..4556016c0 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=i3status
 pkgver=2.4
 pkgrel=1
 pkgdesc="Generates status bar to use with dzen2 or xmobar"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://i3.zekjur.net/i3status/"
 license=('BSD')
 groups=('i3')
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index 5e8d89a49..d28694d8c 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=iasl
 pkgver=20111123
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://acpica.org"
 license=('custom')
 depends=('glibc')
diff --git a/community/iat/PKGBUILD b/community/iat/PKGBUILD
index c458937fa..475ba9630 100644
--- a/community/iat/PKGBUILD
+++ b/community/iat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iat
 pkgver=0.1.7
 pkgrel=4
 pkgdesc="Detects and converts DVD/CD images from BIN/MDF/PDI/CDI/NRG/B5I to ISO-9660"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://iat.berlios.de/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/ibam/PKGBUILD b/community/ibam/PKGBUILD
index bf9cf289c..c3ca9a78a 100644
--- a/community/ibam/PKGBUILD
+++ b/community/ibam/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibam
 pkgver=0.5.2
 pkgrel=4
 pkgdesc="An intelligent battery monitor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ibam.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD
index e6bda9859..442493585 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-anthy
 pkgver=1.2.6
 pkgrel=1
 pkgdesc="Japanese input method Anthy IMEngine for IBus Framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://ibus.googlecode.com"
 depends=('ibus' 'anthy' 'python2')
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index b435eebc9..1f688da6c 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ibus-chewing
 pkgver=1.3.10
 pkgrel=1
 pkgdesc='Chinese Chewing Engine for IBus Framework'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://ibus.googlecode.com'
 depends=('ibus' 'libchewing' 'libxtst')
diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD
index ddcd0322a..e71bcb8d1 100644
--- a/community/ibus-hangul/PKGBUILD
+++ b/community/ibus-hangul/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ibus-hangul
 pkgver=1.4.0
 pkgrel=1
 pkgdesc='Korean input engine for IBus'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ibus.googlecode.com'
 license=('GPL')
 depends=('ibus' 'libhangul')
diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD
index 3539abb01..38a1f02f0 100644
--- a/community/ibus-m17n/PKGBUILD
+++ b/community/ibus-m17n/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-m17n
 pkgver=1.3.3
 pkgrel=1
 pkgdesc='M17N engine for IBus'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/ibus/'
 license=('LGPL')
 depends=('python-pyenchant' 'ibus' 'm17n-db' 'm17n-lib')
diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD
index 132499abe..b5e3fdf3a 100644
--- a/community/ibus-pinyin/PKGBUILD
+++ b/community/ibus-pinyin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-pinyin
 pkgver=1.4.0
 pkgrel=1
 pkgdesc='The PinYin Engine for IBus Input Framework.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='http://ibus.googlecode.com'
 depends=('ibus')
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index 51d3beb3d..9b0a52782 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-qt
 pkgver=1.3.1
 pkgrel=3
 pkgdesc='IBus qt library and IBus qt input method plugin'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='http://ibus.googlecode.com'
 depends=('qt' 'ibus' 'icu')
diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD
index 2d46c7555..f187ec36f 100644
--- a/community/ibus-sunpinyin/PKGBUILD
+++ b/community/ibus-sunpinyin/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ibus-sunpinyin
 pkgver=2.0.3
 pkgrel=2
 pkgdesc='The SunPinYin Engine for IBus Input Framework. SunPinYin is a Statistical Language Model based pinyin IME by Sun.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sunpinyin.googlecode.com'
 license=('LGPL')
 depends=('ibus' 'sunpinyin')
diff --git a/community/ibus-table-extraphrase/PKGBUILD b/community/ibus-table-extraphrase/PKGBUILD
index 04016b0c7..9d1cee64f 100644
--- a/community/ibus-table-extraphrase/PKGBUILD
+++ b/community/ibus-table-extraphrase/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ibus-table-extraphrase
 pkgver=1.3.9.20110826
 pkgrel=1
 pkgdesc="The extra phrases of tables engines for IBus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/ibus/"
 license=('LGPL')
 depends=('ibus-table')
diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD
index eb75f17bd..c7a05272b 100644
--- a/community/ibus-table/PKGBUILD
+++ b/community/ibus-table/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-table
 pkgver=1.3.9.20110827
 pkgrel=1
 pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/ibus/"
 license=('LGPL')
 depends=('python2-pyenchant' 'ibus' 'aspell-en')
diff --git a/community/ibus-unikey/PKGBUILD b/community/ibus-unikey/PKGBUILD
index c59d1e645..3f2a781f5 100644
--- a/community/ibus-unikey/PKGBUILD
+++ b/community/ibus-unikey/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ibus-unikey
 pkgver=0.6.0
 pkgrel=1
 pkgdesc='IBus module for Vietnamese Keyboard'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://code.google.com/p/ibus-unikey/'
 depends=('ibus')
diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 445e8fd37..30708fafe 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus
 pkgver=1.4.0
 pkgrel=1
 pkgdesc='Next Generation Input Bus for Linux.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='http://ibus.googlecode.com'
 depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'python2' 'pygtk' 'pyxdg' 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme' 'gtk3')
diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD
index bb6f410f9..6c81ed1a6 100644
--- a/community/icecast/PKGBUILD
+++ b/community/icecast/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=icecast
 pkgver=2.3.2
 pkgrel=5
 pkgdesc="Streaming audio over the Internet"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.icecast.org/"
 depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora')
diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD
index aed8df1b0..6b0e5ffca 100644
--- a/community/icewm-utils/PKGBUILD
+++ b/community/icewm-utils/PKGBUILD
@@ -19,7 +19,7 @@ _mergeprefsver=0.5
 
 pkgrel=6
 pkgdesc="Suite of tools for IceWM"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=("GPL")
 url="http://icecc.sourceforge.net/"
 depends=('qt3' 'python2')
diff --git a/community/ico2xpm/PKGBUILD b/community/ico2xpm/PKGBUILD
index 5d1ef58da..726e732f9 100644
--- a/community/ico2xpm/PKGBUILD
+++ b/community/ico2xpm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ico2xpm
 pkgver=1.2
 pkgrel=1
 pkgdesc="A utility which converts Windows icons into X pixmaps"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ico2xpm.sourceforge.net/"
 license=('GPL')
 source=(http://downloads.sourceforge.net/ico2xpm/1.2/ico2xpm-1_2-src.tar.gz)
diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD
index d9c24c298..14832b63e 100644
--- a/community/icoutils/PKGBUILD
+++ b/community/icoutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=icoutils
 pkgver=0.29.1
 pkgrel=1
 pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.nongnu.org/icoutils/'
 depends=('libpng>=1.0.0' 'perl-libwww>=5.64')
diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD
index cb62b1ef9..c31ea657a 100644
--- a/community/id3lib-rcc/PKGBUILD
+++ b/community/id3lib-rcc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=id3lib-rcc
 pkgver=3.8.3
 pkgrel=7
 pkgdesc="id3lib with librcc patch"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://id3lib.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'librcc' 'gcc-libs')
diff --git a/community/idesk/PKGBUILD b/community/idesk/PKGBUILD
index 6eeabec92..fb170ca8f 100644
--- a/community/idesk/PKGBUILD
+++ b/community/idesk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=idesk
 pkgver=0.7.5
 pkgrel=3
 pkgdesc="iDesk gives users of minimal wm's (fluxbox, blackbox, openbox, windowsmaker...) icons on their desktop"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://idesk.sourceforge.net/wiki/index.php"
 license=('GPL')
 depends=('pkgconfig' 'imlib2' 'libpng' 'libxpm' 'libxft' 'gcc-libs')
diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD
index 763ae31ed..2cdfc5fab 100644
--- a/community/iftop/PKGBUILD
+++ b/community/iftop/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=iftop
 pkgver=0.17
 pkgrel=9
 pkgdesc="iftop does for network usage what top(1) does for CPU usage"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ex-parrot.com/~pdw/iftop/"
 license=('GPL')
 depends=('libpcap>=1.0.0' 'ncurses')
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index e85372405..5d49eabee 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.1.1
 pkgrel=4
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=('libimobiledevice' 'fuse')
 source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
diff --git a/community/iksemel/PKGBUILD b/community/iksemel/PKGBUILD
index 9034cbbe1..eab6eb7bf 100644
--- a/community/iksemel/PKGBUILD
+++ b/community/iksemel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=iksemel
 pkgver=1.4
 pkgrel=2
 pkgdesc="XML parser library for Jabber applications in ANSI C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/iksemel/"
 license=('LGPL')
 depends=('glibc')
diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD
index 263a0a888..974a8d986 100644
--- a/community/imdbpy/PKGBUILD
+++ b/community/imdbpy/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=4.7
 pkgrel=1
 pkgdesc="Python bindings for the Internet Movie Database (IMDb)"
 url="http://imdbpy.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('python2')
 makedepends=('python2-distribute')
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index c64ad3e44..1479b6c64 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=incron
 pkgver=0.5.9
 pkgrel=2
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
 license=('GPL')
 depends=('gcc-libs' 'bash')
diff --git a/community/iniparser/PKGBUILD b/community/iniparser/PKGBUILD
index e2b7fbb15..f7ddc40de 100644
--- a/community/iniparser/PKGBUILD
+++ b/community/iniparser/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=iniparser
 pkgver=3.0
 pkgrel=1
 pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ndevilla.free.fr/iniparser/"
 license=('MIT')
 depends=()
diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
index 55377a3c0..35f35c9e4 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.5.2
 pkgrel=9
 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
 url="http://www.isc.org/software/inn/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("custom:INN")
 depends=('openssl' 'dovecot')
 makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl')
diff --git a/community/inotify-tools/PKGBUILD b/community/inotify-tools/PKGBUILD
index 020afb70e..93215c7e6 100644
--- a/community/inotify-tools/PKGBUILD
+++ b/community/inotify-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=inotify-tools
 pkgver=3.14
 pkgrel=1
 pkgdesc="inotify-tools is a C library and a set of command-line programs for Linux providing a simple interface to inotify."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://inotify-tools.sourceforge.net/"
 license=('GPL')
 depends=(glibc)
diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD
index b8eb90516..bf87a64d4 100644
--- a/community/inputattach/PKGBUILD
+++ b/community/inputattach/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=inputattach
 pkgver=1.24
 pkgrel=4
 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxconsole.sourceforge.net/"
 license=('GPL')
 depends=('bash')
diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD
index b730e44b3..4cb2123d7 100644
--- a/community/intel-tbb/PKGBUILD
+++ b/community/intel-tbb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=intel-tbb
 pkgver=4.0_20111130
 pkgrel=1
 pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 6c5822693..dd532825a 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=11.0.1
 _pkgver=111.167
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
diff --git a/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD
index 6319690a7..944a86e5f 100644
--- a/community/ipguard/PKGBUILD
+++ b/community/ipguard/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ipguard
 pkgver=1.04
 pkgrel=1
 pkgdesc="ipguard - arp<->ip relation checking tool"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://ipguard.deep.perm.ru/"
 license=("GPL")
 depends=(libpcap libnet)
diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD
index 9f6494038..68555e52d 100644
--- a/community/ipsec-tools/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ipsec-tools
 pkgver=0.8.0
 pkgrel=2
 pkgdesc="KAME IPSec tools ported to Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ipsec-tools.sourceforge.net/"
 depends=('readline' 'openssl' 'krb5')
 makedepends=('linux-headers')
diff --git a/community/ircii-pana/PKGBUILD b/community/ircii-pana/PKGBUILD
index ebbd841a0..8ff4655cf 100644
--- a/community/ircii-pana/PKGBUILD
+++ b/community/ircii-pana/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ircii-pana
 pkgver=1.1
 pkgrel=4
 pkgdesc="A console-based IRC client - AKA BitchX."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bitchx.org"
 license=('GPL2')
 depends=('ncurses')
diff --git a/community/ircservices/PKGBUILD b/community/ircservices/PKGBUILD
index 62c0a58b7..2fc014c87 100644
--- a/community/ircservices/PKGBUILD
+++ b/community/ircservices/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ircservices
 pkgver=5.1.24
 pkgrel=1
 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.ircservices.za.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index 8dd14decd..740ce5a28 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=irrlicht
 pkgver=1.7.2
 pkgrel=3
 pkgdesc="An open source high performance realtime 3D graphics engine."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://irrlicht.sourceforge.net/"
 license=('ZLIB')
 depends=('libgl' 'libjpeg' 'bzip2' 'libpng')
diff --git a/community/isomaster/PKGBUILD b/community/isomaster/PKGBUILD
index 6bb9f6cb8..346040aa9 100644
--- a/community/isomaster/PKGBUILD
+++ b/community/isomaster/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=isomaster
 pkgver=1.3.8
 pkgrel=1
 pkgdesc="CD image editor written in GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://littlesvr.ca/isomaster"
 license=('GPL2')
 depends=('gtk2' 'desktop-file-utils')
diff --git a/community/jabberd14/PKGBUILD b/community/jabberd14/PKGBUILD
index f9edde54f..da0ec5a11 100644
--- a/community/jabberd14/PKGBUILD
+++ b/community/jabberd14/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jabberd14
 pkgver=1.6.1.1
 pkgrel=10
 pkgdesc="old (1.4) jabber server branch"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://jabberd.org/"
 license=("GPL")
 depends=(pth libidn expat popt gnutls)
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 9507e7317..1f876dec7 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -10,12 +10,15 @@ pkgname=('jack2' 'jack2-dbus')
 _tarname=jack
 pkgver=1.9.8
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
 makedepends=('python2' 'doxygen' 'libffado'
              'libsamplerate' 'dbus-core' 'celt')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('python2' 'doxygen'
+             'libsamplerate' 'dbus-core' 'celt')
 source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
@@ -29,9 +32,14 @@ _pyfix() {
 }
 
 _wafconf() {
+  if [ "$CARCH" = "mips64el" ]; then
+    firewire=""
+  else
+    firewire=--firewire
+  fi
   python2 waf configure --prefix=/usr \
                         --alsa \
-                        --firewire \
+                        $firewire \
                         --doxygen $@
 }
 
@@ -75,6 +83,10 @@ package_jack2() {
   optdepends=('libffado: FireWire support'
               'dbus-core: jackdbus'
               'python2: jack_control')
+[ "$CARCH" = "mips64el" ] && \
+  optdepends=('celt: NetJACK2 driver'
+              'dbus-core: jackdbus'
+              'python2: jack_control')
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
@@ -101,6 +113,9 @@ package_jack2-dbus() {
   depends=('libsamplerate' 'celt' 'dbus-core')
   optdepends=('libffado: FireWire support'
               'python2: jack_control')
+[ "$CARCH" = "mips64el" ] && \
+  optdepends=('celt: NetJACK2 driver'
+              'python2: jack_control')
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
 
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index 00981bb6f..583354aa6 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jansson
 pkgver=2.2.1
 pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.digip.org/jansson/'
 license=('MIT')
 options=('!libtool')
diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD
index c622da7e6..64157d8c6 100644
--- a/community/javasqlite/PKGBUILD
+++ b/community/javasqlite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=javasqlite
 pkgver=20110827
 pkgrel=1
 pkgdesc="Java support for SQLite database engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ch-werner.de/javasqlite/"
 license=('BSD')
 depends=('java-runtime<7')
diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD
index d51159ecb..c4a17374b 100644
--- a/community/jbig2dec/PKGBUILD
+++ b/community/jbig2dec/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=jbig2dec
 pkgver=0.11
 pkgrel=2
 pkgdesc="decoder implementation of the JBIG2 image compression format"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://jbig2dec.sourceforge.net/"
 license=('GPL3')
 source=(http://ghostscript.com/~giles/jbig2/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/community/jbigkit/PKGBUILD b/community/jbigkit/PKGBUILD
index 411bcb670..f6ed1709d 100644
--- a/community/jbigkit/PKGBUILD
+++ b/community/jbigkit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=jbigkit
 pkgver=2.0
 pkgrel=2
 pkgdesc="Data compression library/utilities for bi-level high-resolution images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index d47fd0017..b5d0288c4 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.7.9
 pkgrel=1
 _jumbover=5
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openwall.com/$pkgname/"
 license=('GPL2' 'custom')
 depends=('openssl')
diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD
index e86a65456..2dd156623 100644
--- a/community/jshon/PKGBUILD
+++ b/community/jshon/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=jshon
 pkgver=20111222
 pkgrel=1
 pkgdesc="A json parser for the shell."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kmkeen.com/jshon/"
 license=('MIT')
 depends=('jansson')
diff --git a/community/judy/PKGBUILD b/community/judy/PKGBUILD
index b8a165d78..7ea6df59f 100644
--- a/community/judy/PKGBUILD
+++ b/community/judy/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=judy
 pkgver=1.0.5
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="C library creating and accessing dynamic arrays"
 makedepends=(gcc)
 options=(!strip)
diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD
index 6fe9358d5..9584871f7 100644
--- a/community/jwm/PKGBUILD
+++ b/community/jwm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jwm
 pkgver=2.1.0
 pkgrel=1
 pkgdesc="A lightweight window manager for the X11 Window System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://joewing.net/programs/jwm/"
 license=('GPL2')
 depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng')
diff --git a/community/kaa-base/PKGBUILD b/community/kaa-base/PKGBUILD
index 06deb8f6d..7074a24cb 100644
--- a/community/kaa-base/PKGBUILD
+++ b/community/kaa-base/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="KAA base package"
 url="http://freevo.sourceforge.net/"
 license=('GPL2')
 depends=('python2' 'glib2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz)
 md5sums=('5fdac0492dbbb412c2cafe32ea8c60a8')
 
diff --git a/community/kaa-imlib2/PKGBUILD b/community/kaa-imlib2/PKGBUILD
index a220f36be..cfdfd6e8b 100644
--- a/community/kaa-imlib2/PKGBUILD
+++ b/community/kaa-imlib2/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="KAA imlib2 package"
 url="http://freevo.sourceforge.net/"
 license=(GPL2)
 depends=('imlib2' 'python2' 'kaa-base')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz)
 md5sums=('64828ede785ab0dd2d3c1f2f36c99342')
 
diff --git a/community/kaa-metadata/PKGBUILD b/community/kaa-metadata/PKGBUILD
index 116766032..18e1f6b50 100644
--- a/community/kaa-metadata/PKGBUILD
+++ b/community/kaa-metadata/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="KAA metadata package"
 url="http://freevo.sourceforge.net/"
 license=('GPL2')
 depends=('libdvdread' 'python2' 'kaa-base')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz)
 md5sums=('4bca23a0c695b4281ae2220022cdeb77')
 
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index d575a5d51..50f700322 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kadu
 pkgver=0.10.1
 pkgrel=3
 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kadu.net/"
 license=('GPL')
 depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
diff --git a/community/kakasi/PKGBUILD b/community/kakasi/PKGBUILD
index 76b90aa20..fcb40d066 100644
--- a/community/kakasi/PKGBUILD
+++ b/community/kakasi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kakasi
 pkgver=2.3.4
 pkgrel=3
 pkgdesc="Convert Kanji characters to Hiragana, Katakana or Romaji"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kakasi.namazu.org/"
 license=('GPL')
 source=(http://kakasi.namazu.org/stable/${pkgname}-${pkgver}.tar.gz)
diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD
index f0fef23d0..a57c02837 100644
--- a/community/kaudiocreator/PKGBUILD
+++ b/community/kaudiocreator/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kaudiocreator
 pkgver=1.3
 pkgrel=2
 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php/KAudioCreator?content=107645"
 license=('GPL')
 depends=('kdemultimedia-kioslave' 'taglib' 'libdiscid')
diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD
index b99753db4..d0cd583ab 100755
--- a/community/kcheckers/PKGBUILD
+++ b/community/kcheckers/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kcheckers
 pkgver=0.8.1
 pkgrel=7
 pkgdesc="Qt4-based checkers boardgame"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qcheckers.sourceforge.net/"
 license=('GPL')
 depends=('qt')
diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD
index 952d56834..d929dc729 100644
--- a/community/kchmviewer/PKGBUILD
+++ b/community/kchmviewer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kchmviewer
 pkgver=6.0
 pkgrel=2
 pkgdesc="A .chm files (MS HTML help file format) viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kchmviewer.sourceforge.net/"
 license=('GPL')
 depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'qt' 'xdg-utils')
diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD
index 9f25788df..be06d5eb3 100644
--- a/community/kdbg/PKGBUILD
+++ b/community/kdbg/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=kdbg
 pkgver=2.5.1
 pkgrel=1
 pkgdesc="A gdb GUI for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdbg.org"
 license=('GPL')
 depends=('kdebase-runtime' 'gdb')
diff --git a/community/kde4-kio-rapip/PKGBUILD b/community/kde4-kio-rapip/PKGBUILD
index 92377772a..f4464db90 100644
--- a/community/kde4-kio-rapip/PKGBUILD
+++ b/community/kde4-kio-rapip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kde4-kio-rapip
 pkgver=0.2
 pkgrel=1
 pkgdesc="KIOSlave to browse through the PDA file system via the SynCE infrastructure"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://synce.sourceforge.net/"
 license="MIT"
 depends=('kdelibs' 'synce-libsynce' 'synce-librapi')
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index c91e32c6b..3294a519f 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kdenlive
 pkgver=0.8.2.1
 pkgrel=1
 pkgdesc="A non-linear video editor for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdenlive.org/"
 license=('GPL')
 depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
diff --git a/community/kdesvn/PKGBUILD b/community/kdesvn/PKGBUILD
index 8412cb336..f0d900b55 100644
--- a/community/kdesvn/PKGBUILD
+++ b/community/kdesvn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdesvn
 pkgver=1.5.5
 pkgrel=1
 pkgdesc="A pure C++ SVN-client for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alwins-world.de/programs/kdesvn/"
 license=('GPL')
 depends=('hicolor-icon-theme' 'kdelibs' 'subversion' 'xdg-utils' 'qt')
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index 0c4f81fae..f47d77121 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=keepassx
 pkgver=0.4.3
 pkgrel=1
 pkgdesc="Cross platform password manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.keepassx.org/"
 license=('GPL2')
 depends=('qt' 'libxtst')
diff --git a/community/kgraphviewer/PKGBUILD b/community/kgraphviewer/PKGBUILD
index e40108382..fe18a5398 100644
--- a/community/kgraphviewer/PKGBUILD
+++ b/community/kgraphviewer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kgraphviewer
 pkgver=2.1.1
 pkgrel=3
 pkgdesc="A Graphviz dot graph file viewer for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://opendesktop.org/content/show.php?content=23999'
 license=('GPL' 'FDL')
 depends=('kdebase-runtime' 'kdepimlibs' 'graphviz')
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index 678b86096..8960ffefa 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kid3
 pkgver=2.0.1
 pkgrel=1
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kid3.sourceforge.net/"
 license=('GPL')
 depends=('id3lib' 'qt' 'tunepimp')
diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD
index 3b30c8fcc..ad0fbeac0 100644
--- a/community/kiwi/PKGBUILD
+++ b/community/kiwi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kiwi
 pkgver=1.9.29
 pkgrel=1
 pkgdesc="A set of classes and wrappers for PyGTK"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.async.com.br/projects/kiwi"
 license=("LGPL")
 depends=('pygtk')
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 6ffe42ac9..3996eca85 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=klavaro
 pkgver=1.9.3
 pkgrel=1
 pkgdesc="Free touch typing tutor program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://klavaro.sourceforge.net/"
 license=('GPL2')
 depends=('curl' 'gtkdatabox' 'hicolor-icon-theme')
diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD
index 04142c8eb..d3d763040 100644
--- a/community/kleansweep/PKGBUILD
+++ b/community/kleansweep/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=4
 pkgdesc="Allows you to reclaim disk space by finding unneeded files"
 license=("GPL")
 url="http://linux.bydg.org/~yogin/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('kdelibs3' 'python')
 makedepends=('scons')
 options=('libtool')
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index 824d2ff72..136296f83 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kmess
 pkgver=2.0.6.1
 pkgrel=2
 pkgdesc="KMess is a MSN Messenger client for Linux."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kmess.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-lib')
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index 87a39c562..caf5ab674 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=kmymoney
 pkgver=4.6.1
 pkgrel=1
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs')
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 59b346dac..19c36df7b 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=knemo
 pkgver=0.7.3
 pkgrel=1
 pkgdesc="The KDE Network Monitor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=12956"
 license=('GPL')
 depends=('kdebase-workspace' 'wireless_tools' 'iw')
diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD
index 13b780799..aba4638d0 100644
--- a/community/kovpn/PKGBUILD
+++ b/community/kovpn/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.3pre7
 _pkgver=0.3.pre7
 pkgrel=5
 pkgdesc="An OpenVPN client management interface for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=37043"
 license=('GPL')
 depends=('openvpn' 'kdelibs3' 'xdg-utils')
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 834afe33f..eebd4df6b 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=4.1.1
 pkgrel=11
 pkgdesc="KDE Photo Album, picture collection manager"
 url="http://www.kphotoalbum.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs')
diff --git a/community/kpovmodeler/PKGBUILD b/community/kpovmodeler/PKGBUILD
index ef0506a54..ebe6882e7 100644
--- a/community/kpovmodeler/PKGBUILD
+++ b/community/kpovmodeler/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.3
 _kdever=4.1.1
 pkgrel=4
 pkgdesc="A graphical editor for povray scenes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kpovmodeler.org'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'povray')
diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD
index 3328af055..f8301f1a8 100644
--- a/community/krecipes/PKGBUILD
+++ b/community/krecipes/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.0beta2
 _pkgver=2.0-beta2
 pkgrel=2
 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://extragear.kde.org/apps/krecipes/"
 license=('GPL')
 depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme')
diff --git a/community/krename/PKGBUILD b/community/krename/PKGBUILD
index 8c802de9c..b7870078b 100644
--- a/community/krename/PKGBUILD
+++ b/community/krename/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=krename
 pkgver=4.0.9
 pkgrel=1
 pkgdesc="A very powerfull batch file renamer for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.krename.net"
 license=('GPL')
 depends=('kdebase-runtime' 'taglib')
diff --git a/community/ksniffer/PKGBUILD b/community/ksniffer/PKGBUILD
index 15b8a59be..9671a0b62 100644
--- a/community/ksniffer/PKGBUILD
+++ b/community/ksniffer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ksniffer
 pkgver=0.3.2
 pkgrel=5
 pkgdesc="A sniffing application for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ksniffer.org"
 license=('GPL2')
 depends=('libpcap' 'kdelibs3')
diff --git a/community/ksshaskpass/PKGBUILD b/community/ksshaskpass/PKGBUILD
index 63a0198c7..4ecd121e4 100644
--- a/community/ksshaskpass/PKGBUILD
+++ b/community/ksshaskpass/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc='KDE4 implementation of ssh-askpass with Kwallet integration'
 url='http://www.kde-apps.org/content/show.php/Ksshaskpass?content=50971'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 provides=('x11-ssh-askpass')
diff --git a/community/ktechlab/PKGBUILD b/community/ktechlab/PKGBUILD
index ac59910d6..04662f644 100644
--- a/community/ktechlab/PKGBUILD
+++ b/community/ktechlab/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ktechlab
 pkgver=0.3.7
 pkgrel=3
 pkgdesc="IDE for electronic circuits and microcontrollers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ktechlab"
 license=("GPL")
 depends=('kdelibs3' 'gputils' 'gpsim')
diff --git a/community/ktikz/PKGBUILD b/community/ktikz/PKGBUILD
index 380216a6d..129dcaa23 100644
--- a/community/ktikz/PKGBUILD
+++ b/community/ktikz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ktikz
 pkgver=0.10
 pkgrel=2
 pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
 license=("GPL")
 depends=('poppler-qt' 'kdelibs')
diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD
index ad3e93f04..9d8adc1f7 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ktoblzcheck
 pkgver=1.37
 pkgrel=1
 pkgdesc="A library to check account numbers and bank codes of German banks"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://ktoblzcheck.sourceforge.net"
 options=('!libtool')
 license=("LGPL")
diff --git a/community/kuickshow/PKGBUILD b/community/kuickshow/PKGBUILD
index 23b1b6497..0eeb4ea94 100644
--- a/community/kuickshow/PKGBUILD
+++ b/community/kuickshow/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.9.1
 pkgrel=3
 pkgdesc="A very fast and convenient image viewer"
 url="http://userbase.kde.org/KuickShow"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('kdelibs' 'imlib' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index 1566792fb..b24e5a269 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 pkgdesc="Qt-based IRC client"
 url="http://www.kvirc.net"
 depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 makedepends=('cmake')
 license=('GPL')
 options=("!libtool")
diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index 205f3b682..ff3de078c 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kvpnc
 pkgver=0.9.6a
 pkgrel=1
 pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://home.gna.org/kvpnc/"
 license=("GPL")
 depends=('kdelibs' 'hicolor-icon-theme')
diff --git a/community/lal/PKGBUILD b/community/lal/PKGBUILD
index 6a2f6cf38..3d9c83e8f 100644
--- a/community/lal/PKGBUILD
+++ b/community/lal/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lal
 pkgver=1.1
 pkgrel=1
 pkgdesc="A simple dockapp to display the date and/or time"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.l3ib.org/lal/"
 license=('GPL3')
 depends=('libxft' 'libxt')
diff --git a/community/lastfm-client/PKGBUILD b/community/lastfm-client/PKGBUILD
index 85f5530ac..d5fde5d7d 100644
--- a/community/lastfm-client/PKGBUILD
+++ b/community/lastfm-client/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lastfm-client
 pkgver=1.5.4.26862
 pkgrel=4
 pkgdesc="The Last.fm client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.last.fm/tools/downloads/"
 license=('GPL')
 depends=('libpng' 'libjpeg' 'libxinerama' 'libxi' 'fontconfig' 'alsa-lib' 'libxcursor' 'libsm' 'libxrandr' 'qt' 'fftw' 'libsamplerate' 'libmad')
diff --git a/community/launchy/PKGBUILD b/community/launchy/PKGBUILD
index 7cc63520e..05848ddd5 100644
--- a/community/launchy/PKGBUILD
+++ b/community/launchy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=launchy
 pkgver=2.5
 pkgrel=1
 pkgdesc="Launchy indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.launchy.net/"
 license=('GPL')
 depends=('qt' 'xdg-utils')
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index 254d6f68f..1974cd4ea 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Delphi-like IDE for FreePascal'
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('fpc' 'fpc-src' 'gtk2')
 #makedepends=(rpmextract)
 options=('!emptydirs' '!makeflags')
diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD
index 6e28bc429..49febb4d2 100644
--- a/community/ldns/PKGBUILD
+++ b/community/ldns/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ldns
 pkgver=1.6.11
 pkgrel=1
 pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
 depends=('openssl')
diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD
index 35c4efb62..7afa1252e 100644
--- a/community/leafnode/PKGBUILD
+++ b/community/leafnode/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=leafnode
 pkgver=1.11.8
 pkgrel=4
 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://leafnode.sourceforge.net/"
 depends=('pcre' 'xinetd')
 license=('GPL')
diff --git a/community/libacpi/PKGBUILD b/community/libacpi/PKGBUILD
index 26c930902..be13c8864 100644
--- a/community/libacpi/PKGBUILD
+++ b/community/libacpi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libacpi
 pkgver=0.2
 pkgrel=3
 pkgdesc="general purpose lib to gather ACPI data"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.ngolde.de/libacpi.html"
 license=('GPL')
 depends=()
diff --git a/community/libaio/PKGBUILD b/community/libaio/PKGBUILD
index d3c3023ec..3584927df 100644
--- a/community/libaio/PKGBUILD
+++ b/community/libaio/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libaio
 pkgver=0.3.109
 pkgrel=5
 pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lse.sourceforge.net/io/aio.html"
 license=('LGPL')
 source=(ftp://ftp.kernel.org/pub/linux/libs/aio/$pkgname-$pkgver.tar.bz2)
diff --git a/community/libcompizconfig/PKGBUILD b/community/libcompizconfig/PKGBUILD
index 06f224927..901d370fc 100644
--- a/community/libcompizconfig/PKGBUILD
+++ b/community/libcompizconfig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libcompizconfig
 pkgver=0.8.8
 pkgrel=1
 pkgdesc="Compiz configuration system library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.compiz.org"
 license=('GPL')
 depends=('compiz-core' 'libxml2' 'libxcomposite' 'libxinerama' 'startup-notification'
diff --git a/community/libconfig/PKGBUILD b/community/libconfig/PKGBUILD
index 901b7e443..aff83cb5a 100644
--- a/community/libconfig/PKGBUILD
+++ b/community/libconfig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libconfig
 pkgver=1.4.8
 pkgrel=1
 pkgdesc="C/C++ Configuration File Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hyperrealm.com/libconfig/libconfig.html"
 license=('LGPL')
 depends=('gcc-libs' 'texinfo')
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index f0411f553..ba01933d5 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libcss
 pkgver=0.1.0
 pkgrel=2
 pkgdesc="A CSS parser and selection engine."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/libcss/"
 license=('MIT')
 depends=('libparserutils' 'libwapcaplet')
diff --git a/community/libcuefile/PKGBUILD b/community/libcuefile/PKGBUILD
index 92654aec4..7d20e122b 100644
--- a/community/libcuefile/PKGBUILD
+++ b/community/libcuefile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libcuefile
 pkgver=475
 pkgrel=1
 pkgdesc="A library to work with CUE files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musepack.net/index.php?pg=src"
 license=('GPL2')
 depends=('glibc')
diff --git a/community/libdaq/PKGBUILD b/community/libdaq/PKGBUILD
index c949ce3aa..cc8c4b2be 100644
--- a/community/libdaq/PKGBUILD
+++ b/community/libdaq/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdaq
 pkgver=0.6.2
 pkgrel=1
 pkgdesc='Data Acquisition library for packet I/O.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.snort.org/'
 license=('GPL')
 depends=('libpcap')
diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD
index 69e379160..2e8348def 100644
--- a/community/libdbi-drivers/PKGBUILD
+++ b/community/libdbi-drivers/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)"
 url="http://libdbi-drivers.sourceforge.net/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libdbi')
 makedepends=('postgresql-libs' 'libmysqlclient' 'sqlite2' 'sqlite3')
 optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql "
diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD
index 317215e4e..33d422607 100644
--- a/community/libdbi/PKGBUILD
+++ b/community/libdbi/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="A database independant abstraction layer for C"
 url="http://libdbi.sourceforge.net"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 options=(!libtool)
 install=libdbi.install
diff --git a/community/libdesktop-agnostic/PKGBUILD b/community/libdesktop-agnostic/PKGBUILD
index 3c0072045..9244c165a 100644
--- a/community/libdesktop-agnostic/PKGBUILD
+++ b/community/libdesktop-agnostic/PKGBUILD
@@ -5,7 +5,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/libdesktop-agnostic"
 license=('GPL' 'LGPL')
 depends=('glib2' 'gtk2' 'pygtk' 'pygobject')
diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD
index ea6c6a2d7..f3fd73aa4 100644
--- a/community/libdlna/PKGBUILD
+++ b/community/libdlna/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=10
 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards "
 url="http://libdlna.geexbox.org"
 license=("LGPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool' '!makeflags')  # not parallel safe, error find -ldlna  
 makedepends=('ctags')
 depends=('glibc' 'ffmpeg')
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index 3c4c0f057..c7dd280e1 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libdnet
 pkgver=1.12
 pkgrel=6
 pkgdesc="A simplified, portable interface to several low-level networking routines"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 makedepends=(python2)
 optdepends=(python2)
 license=("BSD")
diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD
index 76c54991e..cb6999ace 100644
--- a/community/libesmtp/PKGBUILD
+++ b/community/libesmtp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libesmtp
 pkgver=1.0.6
 pkgrel=2
 pkgdesc='A library to manage posting mail to a preconfigured MTA.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.stafford.uklinux.net/libesmtp/'
 license=('LGPL')
 depends=('openssl')
diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD
index 652d1d0e2..e9dec093d 100644
--- a/community/libev/PKGBUILD
+++ b/community/libev/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libev
 pkgver=4.04
 pkgrel=1
 pkgdesc="A full-featured and high-performance event loop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/libev.html"
 license=('BSD')
 depends=('glibc')
diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD
index 60b3103ae..3b9916ac0 100644
--- a/community/libexosip2/PKGBUILD
+++ b/community/libexosip2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libexosip2
 pkgver=3.6.0
 pkgrel=1
 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/exosip/"
 license=('GPL')
 depends=('libosip2>=3.6.0' 'openssl')
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index 3ff564293..339bf28da 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libextractor
 pkgver=0.6.2
 pkgrel=5
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://gnunet.org/libextractor/"
 depends=('libvorbis' 'libtool' 'gtk2' 'libgsf' 'libmpeg2' 'texinfo')
diff --git a/community/libfakekey/PKGBUILD b/community/libfakekey/PKGBUILD
index 691c4ba75..368baa4fd 100644
--- a/community/libfakekey/PKGBUILD
+++ b/community/libfakekey/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libfakekey
 pkgver=0.1
 pkgrel=4
 pkgdesc='X virtual keyboard library.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://matchbox-project.org/'
 license=('GPL')
 depends=('libxtst')
diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD
index 447f4b364..1ed0c439f 100644
--- a/community/libfaketime/PKGBUILD
+++ b/community/libfaketime/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libfaketime
 pkgver=0.9.1
 pkgrel=1
 pkgdesc='Report fake dates and times to programs without having to change the system-wide time.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.code-wizards.com/projects/libfaketime/'
 license=('GPL2')
 source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index b71ab6e15..3bb9cbc28 100755
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libfbclient
 pkgver=2.5.1.26351
 pkgrel=1
 pkgdesc="Client library for Firebird."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.firebirdsql.org/"
 license=('custom')
 depends=('gcc-libs' 'icu')
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index da2d88601..a6520ffcf 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=libfm
 pkgver=0.1.17
-pkgrel=1
+pkgrel=1.1
 pkgdesc="the core of next generation file manager PCManFM"
 url="http://pcmanfm.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 groups=('lxde')
 options=('!libtool')
diff --git a/community/libgalago-gtk/PKGBUILD b/community/libgalago-gtk/PKGBUILD
index ea6182572..97b6966a4 100644
--- a/community/libgalago-gtk/PKGBUILD
+++ b/community/libgalago-gtk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgalago-gtk
 pkgver=0.5.0
 pkgrel=3
 pkgdesc="GTK+ widgets for the Galago presence framework"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.galago-project.org"
 options=('!libtool')
 license=('LGPL')
diff --git a/community/libgalago/PKGBUILD b/community/libgalago/PKGBUILD
index 9a3853cef..6e0fd95f9 100644
--- a/community/libgalago/PKGBUILD
+++ b/community/libgalago/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgalago
 pkgver=0.5.2
 pkgrel=3
 pkgdesc="The Galago presence library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.galago-project.org"
 options=('!libtool')
 license=("LGPL")
diff --git a/community/libgda3/PKGBUILD b/community/libgda3/PKGBUILD
index aa94f5f82..d96d84690 100644
--- a/community/libgda3/PKGBUILD
+++ b/community/libgda3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgda3
 pkgver=3.1.5
 pkgrel=11
 pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome-db.org/Download"
 license=('GPL')
 depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs'
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index 2d421f932..d9e1dd036 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=libgdamm
 pkgname=(libgdamm libgdamm-docs)
 pkgver=4.99.6
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs')
 url="http://www.gtkmm.org/"
 license=('LGPL')
diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD
index a7e2823f6..5fe0a4863 100644
--- a/community/libgeotiff/PKGBUILD
+++ b/community/libgeotiff/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libgeotiff
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.remotesensing.org/geotiff"
 depends=('libtiff' 'proj' 'libjpeg>=7')
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index bd81279e0..0180e25f0 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgexiv2
 pkgver=0.3.1
 pkgrel=1
 pkgdesc="GObject-based wrapper around the Exiv2 library."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.yorba.org/wiki/gexiv2"
 license=('GPL2')
 depends=('exiv2' 'glib2')
diff --git a/community/libghemical/PKGBUILD b/community/libghemical/PKGBUILD
index 1514a9674..c94b7e300 100644
--- a/community/libghemical/PKGBUILD
+++ b/community/libghemical/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.0.0
 pkgrel=1
 pkgdesc="Library containing computational chemistry facility of ghemical"
 license=("GPL")
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://bioinformatics.org/ghemical/libghemical/"
 depends=('gcc-libs')
 makedepends=('openbabel' 'intltool>=0.40.0')
diff --git a/community/libgig/PKGBUILD b/community/libgig/PKGBUILD
index 9b9442753..c7facb6c5 100644
--- a/community/libgig/PKGBUILD
+++ b/community/libgig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libgig
 pkgver=3.3.0
 pkgrel=1
 pkgdesc="C++ library for loading Gigasampler and DLS files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.linuxsampler.org/libgig/"
 license=('GPL')
 depends=('gcc-libs' 'util-linux-ng' 'libsndfile')
diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD
index 4dfc27e40..234809a11 100644
--- a/community/libgringotts/PKGBUILD
+++ b/community/libgringotts/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgringotts
 pkgver=1.2.1
 pkgrel=7
 pkgdesc="Encryption backend for Gringotts."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.berlios.de/projects/gringotts"
 license=('GPL')
 depends=('bzip2' 'libmcrypt' 'libtool' 'mhash' 'zlib')
diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD
index 1542c58e1..3d3335105 100644
--- a/community/libgtksourceviewmm2/PKGBUILD
+++ b/community/libgtksourceviewmm2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgtksourceviewmm2
 pkgver=2.10.1
 pkgrel=1
 pkgdesc='A C++ API for gtksourceview2'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://projects.gnome.org/gtksourceviewmm/'
 license=('LGPL')
 depends=('gtkmm' 'gtksourceview2')
diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD
index 160373489..fb1a48645 100644
--- a/community/libharu/PKGBUILD
+++ b/community/libharu/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.2.1
 pkgrel=1
 pkgdesc="C/C++ library for generating PDF documents"
 url="http://libharu.org/wiki/Main_Page"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:ZLIB')
 depends=('libpng' 'gcc-libs')
 options=(!libtool)
diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD
index 715b5e46f..c76f66a97 100644
--- a/community/libident/PKGBUILD
+++ b/community/libident/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=libident
 pkgver=0.32
 pkgrel=2
 pkgdesc="New libident C library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/libident/"
 license=('custom')
 source=(http://www.remlab.net/files/libident/libident-$pkgver.tar.gz)
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 4dc307ca4..14bf68291 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libinfinity
 pkgver=0.5.1
 pkgrel=2
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de"
 license=('GPL')
 depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
diff --git a/community/libiptcdata/PKGBUILD b/community/libiptcdata/PKGBUILD
index 0f40d86f3..358bc3197 100644
--- a/community/libiptcdata/PKGBUILD
+++ b/community/libiptcdata/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libiptcdata
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="Library for manipulating the IPTC metadata"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libiptcdata.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD
index 9db15fe88..06400e82c 100644
--- a/community/liblinebreak/PKGBUILD
+++ b/community/liblinebreak/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=liblinebreak
 pkgver=2.0
 pkgrel=1
 pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://vimgadgets.sourceforge.net/liblinebreak/"
 license=("custom:zlib/libpng")
 depends=("glibc")
diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD
index 730fce864..6493172c0 100644
--- a/community/liblockfile/PKGBUILD
+++ b/community/liblockfile/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=liblockfile
 pkgver=1.08_4
 _basever=1.08
-pkgrel=1
+pkgrel=1.1
 pkgdesc="a library with NFS-safe locking functions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/unstable/libs/liblockfile1"
 depends=('glibc')
diff --git a/community/libmaa/PKGBUILD b/community/libmaa/PKGBUILD
index 5a35a9a5d..ea5a4e14e 100644
--- a/community/libmaa/PKGBUILD
+++ b/community/libmaa/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Provides many low-level data structures which are helpful for writing compilers"
 url="http://sourceforge.net/projects/dict/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 makedepends=('flex')
 options=('!libtool')
diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD
index 63eb2cb29..0aafb6d11 100644
--- a/community/libmatchbox/PKGBUILD
+++ b/community/libmatchbox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmatchbox
 pkgver=1.9
 pkgrel=4
 pkgdesc="Base library for Matchbox WM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext')
 options=('!libtool')
diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD
index 35563bd11..2ab1f7b20 100644
--- a/community/libmatio/PKGBUILD
+++ b/community/libmatio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmatio
 pkgver=1.3.3
 pkgrel=2
 pkgdesc="A C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://sourceforge.net/projects/matio"
 depends=('gcc-libs')
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 90208050a..860042a5a 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmediainfo
 pkgver=0.7.51
 pkgrel=1
 pkgdesc="shared library for mediainfo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
 depends=( 'curl' 'libmms>=0.5-2' 'libzen>=0.4.15')
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 015396c72..a94ecd995 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmemcached
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libmemcached.org/"
 license=('GPL')
 depends=('glibc' 'libsasl')
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 7c3836f47..d7ca5a4be 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libmicrohttpd
 pkgver=0.9.18
 pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libmicrohttpd/"
 license=('LGPL')
 options=('!libtool')
diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD
index b0d1ba02b..7f21a13b1 100644
--- a/community/libmirage/PKGBUILD
+++ b/community/libmirage/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmirage
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
 depends=('glib2' 'libsndfile')
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index 6d22c0edf..a62461fe3 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnetfilter_conntrack
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="userspace library providing a programming interface (API) to the in-kernel connection tracking state table"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(libnfnetlink)
 makedepends=(pkgconfig)
 url="http://www.netfilter.org/projects/libnetfilter_conntrack/index.html"
diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD
index c4b25ba9c..e8622ab11 100644
--- a/community/libnetfilter_queue/PKGBUILD
+++ b/community/libnetfilter_queue/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnetfilter_queue
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
 license=('GPL')
 depends=(libnfnetlink)
diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD
index c7a1dff03..0b924ad9e 100644
--- a/community/libnewt/PKGBUILD
+++ b/community/libnewt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnewt
 pkgver=0.52.12
 pkgrel=3
 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.redhat.com"
 license=('GPL')
 depends=('slang' 'popt' 'gpm')
diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD
index fc8e6d8dd..1d984263b 100644
--- a/community/libnfnetlink/PKGBUILD
+++ b/community/libnfnetlink/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnfnetlink
 pkgver=1.0.0
 pkgrel=2
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netfilter.org/projects/libnfnetlink/index.html"
 license=('GPL')
 depends=('glibc')
diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD
index 903663aa7..93fc7d85e 100644
--- a/community/libnids/PKGBUILD
+++ b/community/libnids/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnids
 pkgver=1.24
 pkgrel=1
 pkgdesc="An implementation of an E-component of Network Intrusion Detection System."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libnids.sourceforge.net/"
 license=('GPL')
 depends=('libnet' 'libpcap' 'glib2')
diff --git a/community/libnoise/PKGBUILD b/community/libnoise/PKGBUILD
index 6a7e56ee5..969358eda 100644
--- a/community/libnoise/PKGBUILD
+++ b/community/libnoise/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libnoise
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="A portable, open-source, coherent noise-generating library for C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libnoise.sourceforge.net/"
 license=('LGPL')
 makedepends=('cmake' 'unzip')
diff --git a/community/libnsbmp/PKGBUILD b/community/libnsbmp/PKGBUILD
index 8193e85dd..9b304a407 100644
--- a/community/libnsbmp/PKGBUILD
+++ b/community/libnsbmp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnsbmp
 pkgver=0.0.3
 pkgrel=3
 pkgdesc="Decoding library for BMP and ICO image file formats"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/libnsbmp/"
 license=('MIT')
 depends=('glibc')
diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD
index b31fff221..fa6fcdc72 100644
--- a/community/libnsgif/PKGBUILD
+++ b/community/libnsgif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnsgif
 pkgver=0.0.3
 pkgrel=3
 pkgdesc="Decoding library for the GIF image file format"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/libnsgif/"
 license=('MIT')
 depends=('glibc')
diff --git a/community/liboglappth/PKGBUILD b/community/liboglappth/PKGBUILD
index 950e171d6..fd9809fb2 100644
--- a/community/liboglappth/PKGBUILD
+++ b/community/liboglappth/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0.0
 pkgrel=1
 pkgdesc="Library containing computational chemistry facility of ghemical"
 license=("GPL")
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bioinformatics.org/ghemical/libghemical/"
 depends=('gcc-libs')
 makedepends=('mesa')
diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD
index 3d6834987..b40eac3cf 100644
--- a/community/libopenraw/PKGBUILD
+++ b/community/libopenraw/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libopenraw
 pkgver=0.0.9
 pkgrel=2
 pkgdesc="Library for decoding RAW files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libopenraw.freedesktop.org/"
 license=('LGPL')
 depends=('gdk-pixbuf2')
diff --git a/community/libopensync/PKGBUILD b/community/libopensync/PKGBUILD
index 9fb84c0be..8e2ff03b8 100644
--- a/community/libopensync/PKGBUILD
+++ b/community/libopensync/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc='Stable version of the opensync synchronisation framework'
 url='http://www.opensync.org'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'cmake' 'chrpath')
 depends=('glib2' 'libxml2' 'sqlite3' 'libxslt')
 options=('!libtool')
diff --git a/community/liboping/PKGBUILD b/community/liboping/PKGBUILD
index f4c9acae2..f7907c5d0 100644
--- a/community/liboping/PKGBUILD
+++ b/community/liboping/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.6.1
 pkgrel=1
 pkgdesc='C library to generate ICMP echo requests, better known as "ping packets"'
 url='http://verplant.org/liboping/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 options=('!libtool')
 depends=('libcap')
diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD
index e881de22b..ee400283b 100644
--- a/community/libosip2/PKGBUILD
+++ b/community/libosip2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libosip2
 pkgver=3.6.0
 pkgrel=1
 pkgdesc="oSIP is an implementation of SIP"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/osip/"
 license=('LGPL')
 depends=(glibc)
diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD
index bec068dd0..dea6b1ee0 100644
--- a/community/libpaper/PKGBUILD
+++ b/community/libpaper/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libpaper
 pkgver=1.1.24
 pkgrel=1
 pkgdesc="Library for handling paper characteristics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/unstable/source/libpaper"
 license=('GPL')
 source=(http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_${pkgver}.tar.gz)
diff --git a/community/libpar2/PKGBUILD b/community/libpar2/PKGBUILD
index 48d21954a..05317e3f0 100644
--- a/community/libpar2/PKGBUILD
+++ b/community/libpar2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libpar2
 pkgver=0.2
 pkgrel=4
 pkgdesc="Parity checking library,"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://parchive.sourceforge.net/"
 license=('GPL')
 depends=('libsigc++2.0')
diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD
index e9cd85e1b..470ddbe75 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libparserutils
 pkgver=0.1.1
 pkgrel=1
 pkgdesc="Library for building efficient parsers"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/libparserutils"
 license=('MIT')
 source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz")
diff --git a/community/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD
index fbefdafa7..b3c4e6734 100644
--- a/community/libpqxx/PKGBUILD
+++ b/community/libpqxx/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpqxx
 pkgver=4.0
 pkgrel=1
 pkgdesc="C++ client API for PostgreSQL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://pqxx.org/development/libpqxx/"
 depends=('postgresql-libs>=8.4.1')
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index fe578f5b3..38ba55565 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libraw
 pkgver=0.14.4
 pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libraw.org/"
 license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD
index c5e3ffb0a..3a697f3dd 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=librcc
 pkgver=0.2.6
 pkgrel=5
 pkgdesc="Charset Conversion Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://rusxmms.sourceforge.net/"
 license=('GPL')
 depends=(aspell enca libxml2 db librcd)
diff --git a/community/librcd/PKGBUILD b/community/librcd/PKGBUILD
index 6b4daf162..03f8adcbf 100644
--- a/community/librcd/PKGBUILD
+++ b/community/librcd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=librcd
 pkgver=0.1.11
 pkgrel=2
 pkgdesc="Charset Detection Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://rusxmms.sourceforge.net/"
 depends=(glibc)
 license=('GPL')
diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD
index 6d795f55a..ef36053ad 100644
--- a/community/librep/PKGBUILD
+++ b/community/librep/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.92.1b
 pkgrel=2
 pkgdesc="A Lisp system for UNIX"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sawfish.wikia.com/wiki/Librep"
 depends=('gmp' 'gdbm' 'libffi')
 install=${pkgname}.install
diff --git a/community/libreplaygain/PKGBUILD b/community/libreplaygain/PKGBUILD
index 19505622d..c4b978d51 100644
--- a/community/libreplaygain/PKGBUILD
+++ b/community/libreplaygain/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libreplaygain
 pkgver=475
 pkgrel=1
 pkgdesc="A library to adjust audio gain"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musepack.net/index.php?pg=src"
 license=('LGPL')
 depends=('glibc')
diff --git a/community/librsync/PKGBUILD b/community/librsync/PKGBUILD
index d0fd33cf3..943fe9801 100644
--- a/community/librsync/PKGBUILD
+++ b/community/librsync/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=librsync
 pkgver=0.9.7
 pkgrel=5
 pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://librsync.sourceforge.net/"
 license=('GPL')
 depends=('popt' 'zlib' 'bzip2')
diff --git a/community/librtfcomp/PKGBUILD b/community/librtfcomp/PKGBUILD
index 7622c5f1b..af1efdc99 100644
--- a/community/librtfcomp/PKGBUILD
+++ b/community/librtfcomp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=librtfcomp
 pkgver=1.1
 pkgrel=4
 pkgdesc="SynCE librtfcomp library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.synce.org/"
 depends=(pyrex)
diff --git a/community/libsieve/PKGBUILD b/community/libsieve/PKGBUILD
index fc080c5f8..e24061ba2 100644
--- a/community/libsieve/PKGBUILD
+++ b/community/libsieve/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsieve
 pkgver=2.2.7
 pkgrel=2
 pkgdesc="sieve interpretator lib"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://libsieve.sourceforge.net/"
 license=('GPL')
 options=('!libtool')
diff --git a/community/libstatgrab/PKGBUILD b/community/libstatgrab/PKGBUILD
index 08f42c7d5..16bb04e6c 100644
--- a/community/libstatgrab/PKGBUILD
+++ b/community/libstatgrab/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libstatgrab
 pkgver=0.17
 pkgrel=1
 pkgdesc="A library that provides cross platform access to statistics about the system on which it's run"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.i-scream.org/libstatgrab"
 license=('LGPL' 'GPL')
 depends=('ncurses' 'perl')
diff --git a/community/libsynaptics/PKGBUILD b/community/libsynaptics/PKGBUILD
index 69966e5f2..9422a9a01 100644
--- a/community/libsynaptics/PKGBUILD
+++ b/community/libsynaptics/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libsynaptics
 pkgver=0.14.6c
 pkgrel=4
 pkgdesc="Library for accessing synaptics touchpads"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qsynaptics.sourceforge.net"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/community/libtar/PKGBUILD b/community/libtar/PKGBUILD
index 62f5394b9..218f5a557 100644
--- a/community/libtar/PKGBUILD
+++ b/community/libtar/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libtar
 pkgver=1.2.11
 pkgrel=2
 pkgdesc="C library for manipulating POSIX tar files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.feep.net/libtar/"
 license=('BSD')
 depends=('zlib')
diff --git a/community/libtlen/PKGBUILD b/community/libtlen/PKGBUILD
index e4c4bbf72..a853c7193 100644
--- a/community/libtlen/PKGBUILD
+++ b/community/libtlen/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libtlen
 pkgver=20041113
 pkgrel=4
 pkgdesc="A Tlen.pl protocol library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libtlen.sourceforge.net/"
 license=("GPL")
 depends=(glibc)
diff --git a/community/libtommath/PKGBUILD b/community/libtommath/PKGBUILD
index 33c60ba42..c8e835202 100644
--- a/community/libtommath/PKGBUILD
+++ b/community/libtommath/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="Highly optimized and portable routines for integer based number theoretic applications"
 url="http://www.libtom.org/"
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://libtom.org/files/ltm-${pkgver}.tar.bz2"
         'libtommath-0.42.0-makefile.patch')
 md5sums=('7380da904b020301be7045cb3a89039b'
diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD
index a15316f09..de466dea5 100644
--- a/community/libtorrent/PKGBUILD
+++ b/community/libtorrent/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='BitTorrent library written in C++'
 url='http://libtorrent.rakshasa.no/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libsigc++2.0' 'openssl')
 options=('!libtool')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/libview/PKGBUILD b/community/libview/PKGBUILD
index faf65a9cd..1137d4e78 100644
--- a/community/libview/PKGBUILD
+++ b/community/libview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libview
 pkgver=0.6.6
 pkgrel=1
 pkgdesc="A collection of widgets that were developed at VMware"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://view.sourceforge.net"
 options=('!libtool')
 license=('MIT')
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 5038f5816..5b73e4069 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libvirt
 pkgver=0.9.9
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
 license=('LGPL')
 depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
diff --git a/community/libvisual-projectm/PKGBUILD b/community/libvisual-projectm/PKGBUILD
index 76635d757..976b3cbff 100644
--- a/community/libvisual-projectm/PKGBUILD
+++ b/community/libvisual-projectm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libvisual-projectm
 pkgver=2.0.1
 pkgrel=3
 pkgdesc='ProjectM XMMS plugin.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
 license=('GPL')
 depends=('projectm>=2.0.1' 'libvisual' 'sdl')
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 6dc92c5ce..a1ce96856 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwapcaplet
 pkgver=0.1.0
 pkgrel=2
 pkgdesc="A string internment library with rapid string comparison."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/projects/libwapcaplet/"
 license=('MIT')
 source=(http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz)
diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD
index c26669f7d..a0d1852ac 100644
--- a/community/libwww/PKGBUILD
+++ b/community/libwww/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libwww
 pkgver=5.4.0
 pkgrel=5
 pkgdesc="A general-purpose client side WEB API"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.w3.org/Library/"
 license=('W3C')
 depends=()
diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD
index 460166174..99cd709f4 100644
--- a/community/libx86/PKGBUILD
+++ b/community/libx86/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libx86
 pkgver=1.1
 pkgrel=3
 pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codon.org.uk/~mjg59/libx86/"
 license=('custom')
 depends=('glibc')
diff --git a/community/libx86emu/PKGBUILD b/community/libx86emu/PKGBUILD
index 83f8429b6..fde41f504 100644
--- a/community/libx86emu/PKGBUILD
+++ b/community/libx86emu/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1
 _pkgver=$pkgver-9.9
 pkgrel=28
 pkgdesc='x86 emulation library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opensuse.org/'
 license=('BSD')
 depends=('glibc')
diff --git a/community/libxdg-basedir/PKGBUILD b/community/libxdg-basedir/PKGBUILD
index e11b24214..755f4ad35 100644
--- a/community/libxdg-basedir/PKGBUILD
+++ b/community/libxdg-basedir/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxdg-basedir
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="An implementation of the XDG Base Directory specifications."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir"
 license=('MIT')
 depends=('glibc')
diff --git a/community/libyaml/PKGBUILD b/community/libyaml/PKGBUILD
index f3ef4b81c..cce92abf4 100644
--- a/community/libyaml/PKGBUILD
+++ b/community/libyaml/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libyaml
 pkgver=0.1.4
 pkgrel=1
 pkgdesc="YAML 1.1 library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pyyaml.org/wiki/LibYAML"
 license=('MIT')
 source=(http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz)
diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD
index 4f4fd5d7f..8a1ee0723 100644
--- a/community/libzen/PKGBUILD
+++ b/community/libzen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libzen
 pkgver=0.4.23
 pkgrel=1
 pkgdesc="shared library for libmediainfo and mediainfo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('BSD')
 depends=('gcc-libs')
diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD
index 0723c10b4..415edc81a 100644
--- a/community/libzrtpcpp/PKGBUILD
+++ b/community/libzrtpcpp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libzrtpcpp
 pkgver=1.4.2
 pkgrel=5
 pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zfoneproject.com"
 license=('GPL')
 depends=('ccrtp')
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
index 33cb3d7c6..a49e2aa10 100644
--- a/community/lightspark/PKGBUILD
+++ b/community/lightspark/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lightspark
 pkgver=0.5.4
 pkgrel=1
 pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://lightspark.sourceforge.net'
 license=('LGPL3')
 conflicts=('lightspark-git')
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 245985415..e8e45cdb3 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lilypond
 pkgver=2.14.2
 pkgrel=4
 pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lilypond.org"
 license=('GPL')
 depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD
index a6627c72d..4685226ff 100644
--- a/community/lilyterm/PKGBUILD
+++ b/community/lilyterm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lilyterm
 pkgver=0.9.8
 pkgrel=1
 pkgdesc="A light and easy to use libvte based X terminal emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lilyterm.luna.com.tw/index_en.html"
 license=('GPL3')
 depends=('vte')
diff --git a/community/lincity-ng/PKGBUILD b/community/lincity-ng/PKGBUILD
index 3efb1f767..78463052c 100644
--- a/community/lincity-ng/PKGBUILD
+++ b/community/lincity-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lincity-ng
 pkgver=2.0
 pkgrel=3
 pkgdesc="A City Simulation Game. It is a polished and improved version of the classic LinCity game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lincity-ng.berlios.de/wiki/index.php/Main_Page"
 license=('GPL' 'custom')
 depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl')
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 0f81fe282..ec27ab915 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=linphone
 pkgver=3.5.0
 pkgrel=3
 pkgdesc="A Voice-over-IP phone"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng"
 license=('GPL')
 depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils'
diff --git a/community/linuxdcpp/PKGBUILD b/community/linuxdcpp/PKGBUILD
index fe546fdfc..eaef8d232 100644
--- a/community/linuxdcpp/PKGBUILD
+++ b/community/linuxdcpp/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="A Gtk+ Direct Connect client based on DC++."
 url="https://launchpad.net/linuxdcpp/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'glib2' 'libglade' 'bzip2' 'libnotify' 'hicolor-icon-theme')
 makedepends=('scons' 'boost')
 conflicts=('linuxdcpp-bzr')
diff --git a/community/linuxsampler/PKGBUILD b/community/linuxsampler/PKGBUILD
index 46560fbf9..f2f7f9846 100644
--- a/community/linuxsampler/PKGBUILD
+++ b/community/linuxsampler/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=linuxsampler
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="Professional-grade audio sampler alternative to Gigasampler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.linuxsampler.org/"
 license=('GPL' 'custom')
 depends=('libgig' 'jack' 'sqlite3')
diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD
index 69ff17ba1..fe902bd15 100644
--- a/community/linuxtv-dvb-apps/PKGBUILD
+++ b/community/linuxtv-dvb-apps/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1452
 pkgrel=1
 _hgrev=d4e8bf5658ce
 pkgdesc='Viewer programs for DVB cards'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxtv.org/'
 license=('GPL')
 source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2")
diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD
index e3fcd7659..fc9280f91 100644
--- a/community/lmms/PKGBUILD
+++ b/community/lmms/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lmms
 pkgver=0.4.12
 pkgrel=1
 pkgdesc="The Linux MultiMedia Studio"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lmms.sourceforge.net/"
 license=('GPL')
 depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt' 'sdl_sound' 'libsamplerate' 'shared-mime-info')
@@ -16,7 +16,7 @@ optdepends=('wine: VST support (experimental)'
             'stk: STK instruments plugins'
             'pulseaudio: PulseAudio output')
 makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
-[ $CARCH = i686 ] && makedepends+=('wine')
+[[ $CARCH = i686 ]] && makedepends+=('wine')
 provides=('lmms-extras')
 conflicts=('lmms-extras')
 options=('!libtool' '!makeflags')
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD
index 6486c74aa..7949b4cdd 100644
--- a/community/lockdev/PKGBUILD
+++ b/community/lockdev/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=3
 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
 url='http://packages.qa.debian.org/l/lockdev.html'
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
 	      "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz")
 md5sums=('64b9c1b87b125fc348e892e24625524a'
diff --git a/community/lockfile-progs/PKGBUILD b/community/lockfile-progs/PKGBUILD
index b49a8f50e..70dee143a 100644
--- a/community/lockfile-progs/PKGBUILD
+++ b/community/lockfile-progs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lockfile-progs
 pkgver=0.1.15
 pkgrel=1
 pkgdesc="programs for locking and unlocking files and mailboxes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/unstable/misc/lockfile-progs"
 depends=('glibc')
diff --git a/community/lorcon-old-svn/PKGBUILD b/community/lorcon-old-svn/PKGBUILD
index 271937ec6..0a9fb9e0b 100644
--- a/community/lorcon-old-svn/PKGBUILD
+++ b/community/lorcon-old-svn/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames"
 url='http://802.11ninja.net'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libnl')
 options=('!libtool')
 source=("ftp://ftp.archlinux.org/other/community/lorcon-old/lorcon-old-${pkgver}.tar.bz2")
diff --git a/community/lrzsz/PKGBUILD b/community/lrzsz/PKGBUILD
index eb90c46d6..66a420ebc 100644
--- a/community/lrzsz/PKGBUILD
+++ b/community/lrzsz/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc="xmodem, ymodem and zmodem file transfer protocols"
 url="http://www.ohse.de/uwe/software/lrzsz.html"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://www.ohse.de/uwe/releases/$pkgname-$pkgver.tar.gz
 	lrzsz.patch)
 md5sums=('b5ce6a74abc9b9eb2af94dffdfd372a4'
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 2a42c84d2..a3f60dde8 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
 url="http://ezix.org/project/wiki/HardwareLiSter"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 optdepends=('gtk2')
 makedepends=('gcc' 'gtk2' 'sqlite3')
diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD
index 17db56fa0..b21b1e5cc 100644
--- a/community/ltris/PKGBUILD
+++ b/community/ltris/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ltris
 pkgver=1.0.18
 pkgrel=1
 pkgdesc="A tetris clone where you have a bowl with blocks falling down"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lgames.sourceforge.net/index.php?project=LTris"
 license=('GPL')
 depends=('sdl_mixer')
diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD
index 0ab900164..971baccb9 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -8,7 +8,7 @@ _gitver=8d07669
 _luaver=5.1
 url="http://github.com/brimworks/lua-zlib"
 pkgdesc='Simple streaming interface to zlib for Lua.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('lua' 'zlib')
 makedepends=('cmake')
diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD
index a69a617b8..4d4a35193 100644
--- a/community/luaexpat/PKGBUILD
+++ b/community/luaexpat/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=luaexpat
 pkgver=1.2.0
 pkgrel=1
 pkgdesc='LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.matthewwild.co.uk/lua-expat'
 license=('MIT')
 makedepends=('gcc' 'lua>=5.1' 'expat>=2')
diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD
index 49266f90b..ebfdd18b6 100644
--- a/community/luafilesystem/PKGBUILD
+++ b/community/luafilesystem/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=luafilesystem
 pkgver=1.5.0
 pkgrel=1
 pkgdesc="File System Library for the Lua Programming Language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.keplerproject.org/luafilesystem/"
 license=('MIT')
 depends=(lua)
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index c2e105479..f5630efd1 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=luakit
 pkgver=2011.07.22
 pkgrel=2
 pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.luakit.org/projects/luakit'
 license=('GPL3')
 depends=('libwebkit' 'luafilesystem' 'libunique')
diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD
index 8acf5904b..8f395f63f 100644
--- a/community/luarocks/PKGBUILD
+++ b/community/luarocks/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=luarocks
 pkgver=2.0.7.1
 pkgrel=1
 pkgdesc='Deployment and management system for Lua modules'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://luarocks.org/"
 depends=('lua' 'unzip' 'zip' 'curl')
 optdepends=('cvs: for fetching sources from CVS repositories'
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index 9cf2f5118..fcb9d5451 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=luasec
 pkgver=0.4
 pkgrel=2
 pkgdesc="Lua bindings for OpenSSL library to provide TLS/SSL communication."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://luasec.luaforge.net/"
 license=('MIT')
 depends=('openssl>=0.9.7' 'lua>=5.1' 'luasocket>=2.0.2')
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index 21e96f09d..488f518d7 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=luasocket
 pkgver=2.0.2
 pkgrel=5
 pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.princeton.edu/~diego/professional/luasocket/"
 license=('MIT')
 depends=(lua)
diff --git a/community/luasql-mysql/PKGBUILD b/community/luasql-mysql/PKGBUILD
index 54aff4c20..97819127e 100644
--- a/community/luasql-mysql/PKGBUILD
+++ b/community/luasql-mysql/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=luasql-mysql
 pkgver=2.2.0
 pkgrel=1
 pkgdesc="MySQL module for Lua"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.keplerproject.org/luasql/"
 license=('MIT')
 depends=('lua' 'libmysqlclient')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index f29d49477..928517162 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=luminancehdr
 pkgver=2.1.0
 pkgrel=6
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
 depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index ff955101f..59844fd42 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -6,7 +6,7 @@ _pkgver=ed424ec77571
 pkgrel=7
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using GPUs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('freeimage' 'freeglut' 'glew' 'libcl')
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index 3cb9ad56e..df8c90bb3 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.8
 _pkgver=45d3e13eb94c
 pkgrel=11
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
diff --git a/community/lwm/PKGBUILD b/community/lwm/PKGBUILD
index 015928b53..f14f5c36a 100644
--- a/community/lwm/PKGBUILD
+++ b/community/lwm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lwm
 pkgver=1.2.2
 pkgrel=1
 pkgdesc="a very light weight window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.jfc.org.uk/software/lwm.html"
 depends=('xorg-server')
diff --git a/community/lwp/PKGBUILD b/community/lwp/PKGBUILD
index cf51ab8d4..6c70d064b 100644
--- a/community/lwp/PKGBUILD
+++ b/community/lwp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lwp
 pkgver=2.6
 pkgrel=1
 pkgdesc="Light weight process library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
 options=('!libtool')
 license=("LGPL")
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 37bfd344a..a01cf7932 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxappearance
 pkgver=0.5.1
 pkgrel=3
 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD
index 808afbf1f..2bf03bb55 100644
--- a/community/lxde-common/PKGBUILD
+++ b/community/lxde-common/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxde-common
 pkgver=0.5.5
 pkgrel=1
 pkgdesc="Common files of the LXDE Desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 groups=('lxde')
 depends=('libx11' 'glib2' 'lxde-icon-theme')
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 568bfc517..373ca457b 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxdm
 pkgver=0.4.1
 pkgrel=7
 pkgdesc="Lightweight Display Manager (part of LXDE)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
 license=('GPL')
 groups=('lxde')
diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD
index 743a83d99..c8bac639a 100644
--- a/community/lxlauncher/PKGBUILD
+++ b/community/lxlauncher/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lxlauncher
 pkgver=0.2.2
 pkgrel=1
 pkgdesc="Launcher for Asus EeePC (part of LXDE)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD
index 6087648d9..cdb8fc741 100644
--- a/community/lxmenu-data/PKGBUILD
+++ b/community/lxmenu-data/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxmenu-data
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="freedesktop.org desktop menus for LXDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxnm/PKGBUILD b/community/lxnm/PKGBUILD
index 8543678e2..a14cc780e 100644
--- a/community/lxnm/PKGBUILD
+++ b/community/lxnm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxnm
 pkgver=0.2.2
 pkgrel=2
 pkgdesc="A Network Manager (Part of LXDE)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org"
 depends=('glib2')
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index e4c3a5440..e890567e6 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxpanel
 pkgver=0.5.8
 pkgrel=2
 pkgdesc="Panel of the LXDE Desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxrandr/PKGBUILD b/community/lxrandr/PKGBUILD
index 85ea3c7b0..c427394b5 100644
--- a/community/lxrandr/PKGBUILD
+++ b/community/lxrandr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxrandr
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="Monitor configuration tool (part of LXDE)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD
index db8719774..808b33161 100644
--- a/community/lxsession/PKGBUILD
+++ b/community/lxsession/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxsession
 pkgver=0.4.6.1
 pkgrel=1
 pkgdesc="Session manager of the LXDE Desktop (light version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index db8d97ae5..8fa1911f3 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lxtask
 pkgver=0.1.4
 pkgrel=3
 pkgdesc="Task manager of the LXDE Desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/lxterminal/PKGBUILD b/community/lxterminal/PKGBUILD
index 43ee1f6d2..8c76a79ca 100644
--- a/community/lxterminal/PKGBUILD
+++ b/community/lxterminal/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lxterminal
 pkgver=0.1.11
 pkgrel=1
 pkgdesc="VTE-based terminal emulator (part of LXDE)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD
index 2b270ddd8..456e3fcea 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=macchanger
 pkgver=1.5.0
 pkgrel=3
 pkgdesc="A small utility to change you NIC's MAC address"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnu.org/gnu/macchanger"
 license=('GPL')
 source=(http://ftp.gnu.org/gnu/macchanger/$pkgname-$pkgver.tar.gz)
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index 22f3a5697..2a6cc72c7 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=madman
 pkgver=0.94beta1.20060611
 pkgrel=3
 pkgdesc="I-tunes like music player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://madman.sourceforge.net/"
 license=('GPL')
 depends=('qt3' 'xmms' 'gtk' 'taglib')
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index 81afe7b4c..30889c09c 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mailutils
 pkgver=2.2
 pkgrel=4
 pkgdesc="MUA command line tool (mailx)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/mailutils/"
 license=('GPL')
 depends=('libldap' 'pam' 'gnutls' 'guile')
diff --git a/community/mairix/PKGBUILD b/community/mairix/PKGBUILD
index 4078c4e22..e294caf17 100644
--- a/community/mairix/PKGBUILD
+++ b/community/mairix/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mairix
 pkgver=0.22
 pkgrel=1
 pkgdesc="A program for indexing and searching emails"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rpcurnow.force9.co.uk/mairix/"
 license=('GPL')
 depends=(bzip2 zlib)
diff --git a/community/mandvd/PKGBUILD b/community/mandvd/PKGBUILD
index 2fbc8c39a..123c0294e 100644
--- a/community/mandvd/PKGBUILD
+++ b/community/mandvd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mandvd
 pkgver=2.6
 pkgrel=1
 pkgdesc="A program to simply create DVD Video"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php/ManDVD?content=83906"
 license=('GPL')
 depends=('dvd+rw-tools>=5.21.4' 'dvd-slideshow>=0.7.5' 'mjpegtools>=1.8.0' 'mplayer' 'qt3' 'xine-ui>=0.99.4')
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 98af0c4d7..fc7444c49 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mapnik
 pkgver=0.7.1
 pkgrel=12
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mapnik.org/"
 license=('LGPL')
 depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD
index cfd72dee2..d60c4078e 100644
--- a/community/mashup/PKGBUILD
+++ b/community/mashup/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.3
 pkgrel=1
 pkgdesc="Adjusting images on a sheet of paper for printing"
 url="http://kornelix.squarespace.com/$pkgname"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('gtk2')
 replaces=('printoxx')
diff --git a/community/matchbox-desktop/PKGBUILD b/community/matchbox-desktop/PKGBUILD
index 637edc3e2..807603bb1 100644
--- a/community/matchbox-desktop/PKGBUILD
+++ b/community/matchbox-desktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=matchbox-desktop
 pkgver=2.0
 pkgrel=2
 pkgdesc="A PDA style application launcher or 'item browser'."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libmatchbox' 'startup-notification' 'libpng' 'gtk2')
 url="http://matchbox-project.org/"
diff --git a/community/matchbox-keyboard/PKGBUILD b/community/matchbox-keyboard/PKGBUILD
index 51d822e22..771dc1ff5 100644
--- a/community/matchbox-keyboard/PKGBUILD
+++ b/community/matchbox-keyboard/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=matchbox-keyboard
 pkgver=0.1
 pkgrel=3
 pkgdesc="An on screen virtual keyboard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('cairo' 'libfakekey' 'libxft')
 url="http://matchbox-project.org/"
 license=('GPL')
diff --git a/community/matchbox-panel/PKGBUILD b/community/matchbox-panel/PKGBUILD
index 043e03d17..14f46d1a9 100644
--- a/community/matchbox-panel/PKGBUILD
+++ b/community/matchbox-panel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=matchbox-panel
 pkgver=0.9.3
 pkgrel=4
 pkgdesc="A flexible always present 'window bar' for holding application launchers and small 'applet' style applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libmatchbox' 'startup-notification' 'libpng')
 url="http://matchbox-project.org/"
diff --git a/community/matchbox-window-manager/PKGBUILD b/community/matchbox-window-manager/PKGBUILD
index 8a093e686..66a07c86e 100644
--- a/community/matchbox-window-manager/PKGBUILD
+++ b/community/matchbox-window-manager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=matchbox-window-manager
 pkgver=1.2
 pkgrel=2
 pkgdesc="A pretty much unique X window manager with a classic PDA management policy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libmatchbox' 'startup-notification' 'libpng' 'libsm')
 url="http://matchbox-project.org/"
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index 77d6a7726..46f2b44a8 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mathomatic
 pkgver=15.7.2
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://mathomatic.orgserve.de/math/"
 depends=('readline')
diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD
index fa0c71344..5164c8e03 100644
--- a/community/mc/PKGBUILD
+++ b/community/mc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mc
 pkgver=4.8.1
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
 depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD
index 603298562..6f3eeabaa 100644
--- a/community/mcabber/PKGBUILD
+++ b/community/mcabber/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mcabber
 pkgver=0.10.1
 pkgrel=1
 pkgdesc="a small Jabber console client, includes features: SSL, PGP, MUC, UTF8"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lilotux.net/~mikael/mcabber/"
 license=('GPL')
 depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell')
diff --git a/community/mcdp/PKGBUILD b/community/mcdp/PKGBUILD
index ffba24072..961480e9c 100644
--- a/community/mcdp/PKGBUILD
+++ b/community/mcdp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mcdp
 pkgver=0.4b
 pkgrel=1
 pkgdesc="Small console cd player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mcmilk.de/projects/mcdp/"
 license=('GPL')
 makedepends=('dietlibc')
diff --git a/community/mdf2iso/PKGBUILD b/community/mdf2iso/PKGBUILD
index 21370ed35..2c8decc4c 100644
--- a/community/mdf2iso/PKGBUILD
+++ b/community/mdf2iso/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mdf2iso
 pkgver=0.3.0
 pkgrel=4
 pkgdesc="Converts Alcohol 120% .mdf files into .iso files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mdf2iso.berlios.de"
 license=('GPL')
 depends=('glibc')
diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD
index 4a97fb410..f3f114783 100644
--- a/community/me-tv/PKGBUILD
+++ b/community/me-tv/PKGBUILD
@@ -8,7 +8,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index d2a10bc10..425dada88 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mediainfo-gui
 pkgver=0.7.51
 pkgrel=1
 pkgdesc="GUI for mediainfo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
 depends=('libmediainfo>=0.7.35' 'wxgtk')
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index 326c00e48..e954b259e 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mediainfo
 pkgver=0.7.51
 pkgrel=1
 pkgdesc="supplies technical and tag information about a video or audio file"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
 depends=('libmediainfo>=0.7.35')
diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD
index 0eb595386..c339165b5 100644
--- a/community/mediaproxy/PKGBUILD
+++ b/community/mediaproxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.5.2
 pkgrel=1
 pkgdesc="Open-source media proxy for OpenSER"
 url="http://mediaproxy.ag-projects.com/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('python2' 'libnetfilter_conntrack' 'iptables'
 	 'python-application' 'python-cjson' 'python-gnutls')
diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD
index deab9b14a..728f962c3 100644
--- a/community/medit/PKGBUILD
+++ b/community/medit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=medit
 pkgver=1.0.5
 pkgrel=2
 pkgdesc="A GTK text editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mooedit.sourceforge.net"
 options=('!emptydirs')
 license=('GPL')
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 6df58d747..265ddeed9 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=megaglest
 pkgver=3.6.0.3
 pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/megaglest/"
 license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew'
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index 693f22de8..74749321c 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=menu-cache
 pkgver=0.3.2
 pkgrel=1
 pkgdesc="Caches to speed up freedesktop.org's application menus use."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
diff --git a/community/metakit/PKGBUILD b/community/metakit/PKGBUILD
index b190002c4..b5f89e93c 100644
--- a/community/metakit/PKGBUILD
+++ b/community/metakit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=metakit
 pkgver=2.4.9.7
 pkgrel=4
 pkgdesc='MetaKit is an efficient database library with a small footprint'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.equi4.com/metakit/'
 makedepends=('tcl' 'python2')
 license=('BSD')
diff --git a/community/metamail/PKGBUILD b/community/metamail/PKGBUILD
index 9f45530ed..00664f77b 100644
--- a/community/metamail/PKGBUILD
+++ b/community/metamail/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=metamail
 pkgver=2.7
 pkgrel=5
 pkgdesc="Used to display and process MIME messages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/stable/mail/metamail"
 license=('custom')
 depends=('ncurses')
diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
index 056f40d52..d9d01a30b 100644
--- a/community/metapixel/PKGBUILD
+++ b/community/metapixel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=metapixel
 pkgver=1.0.2
 pkgrel=2
 pkgdesc='A program for generating photomosaics.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.complang.tuwien.ac.at/schani/metapixel/'
 license=('GPL')
 depends=('libungif' 'libjpeg' 'libpng' 'perl')
diff --git a/community/mezogis/PKGBUILD b/community/mezogis/PKGBUILD
index 988d38ae9..520bb36dd 100644
--- a/community/mezogis/PKGBUILD
+++ b/community/mezogis/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mezogis
 pkgver=0.1.5
 pkgrel=4
 pkgdesc="A GIS application to query and analyse spatial data"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mezogis.org"
 license=('GPL')
 depends=('pygtk' 'python-geotypes' 'postgis>=1.4')
diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index ce0be25e3..857563518 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.6.20
 pkgrel=8
 pkgdesc="MooseFS, fault tolerant, network distributed file system"
 license=("GPL3")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 depends=('zlib' 'fuse' 'python2')
 url="http://www.moosefs.com/"
diff --git a/community/mftrace/PKGBUILD b/community/mftrace/PKGBUILD
index 6d03e7608..c6c7d32f6 100644
--- a/community/mftrace/PKGBUILD
+++ b/community/mftrace/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mftrace
 pkgver=1.2.17
 pkgrel=1
 pkgdesc="Traces TeX bitmap fonts into PFA, PFB, or TTF"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lilypond.org/mftrace/"
 license=("GPL")
 depends=('python2' 'potrace' 't1utils')
diff --git a/community/mg/PKGBUILD b/community/mg/PKGBUILD
index fccdab16a..5f8fff086 100644
--- a/community/mg/PKGBUILD
+++ b/community/mg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mg
 pkgver=20110120
 pkgrel=1
 pkgdesc="mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://homepage.boetes.org/software/mg/"
 depends=('ncurses')
 license=('custom')
diff --git a/community/mget/PKGBUILD b/community/mget/PKGBUILD
index fb960d5cd..458d0f83d 100644
--- a/community/mget/PKGBUILD
+++ b/community/mget/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mget
 pkgver=1.50
 pkgrel=2
 pkgdesc="Simple script allowing to download embedded movies from various video hosting services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://movie-get.org/"
 license=('GPL2')
 depends=('ruby' 'wget')
diff --git a/community/mimetex/PKGBUILD b/community/mimetex/PKGBUILD
index e6ceb75de..4cdb481e8 100644
--- a/community/mimetex/PKGBUILD
+++ b/community/mimetex/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mimetex
 pkgver=1.70
 pkgrel=2
 pkgdesc="tex to gif converter"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.forkosh.com/mimetex.html"
 license=('GPL')
 depends=()
diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD
index a762e584e..eb9885df6 100644
--- a/community/minbif/PKGBUILD
+++ b/community/minbif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=minbif
 pkgver=1.0.4
 pkgrel=4
 pkgdesc='An IRC gateway to IM networks that uses libpurple.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://minbif.im/'
 license=('GPL2')
 depends=('gnutls' 'libcaca' 'libpurple')
diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD
index 930f97380..d5d575891 100644
--- a/community/mingw32-binutils/PKGBUILD
+++ b/community/mingw32-binutils/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mingw32-binutils
 pkgver=2.22
 pkgrel=1
 _uprel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/"
 pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)"
 depends=('glibc' 'zlib')
diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD
index 08da00e6d..2735d3fbb 100644
--- a/community/mingw32-gcc-base/PKGBUILD
+++ b/community/mingw32-gcc-base/PKGBUILD
@@ -9,7 +9,7 @@ _runtimever=3.20
 _uprel=1
 _upw32rel=1
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="A C cross-compiler for building Windows executables on Linux"
 depends=(mingw32-binutils)
 makedepends=(p7zip mingw32-runtime mingw32-w32api)
diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD
index 058236e68..69b2aa3ec 100644
--- a/community/mingw32-gcc/PKGBUILD
+++ b/community/mingw32-gcc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mingw32-gcc
 pkgver=4.6.2
 pkgrel=1
 _uprel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux"
 depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api'
 	 'libmpc' 'elfutils' 'gmp')
@@ -41,7 +41,7 @@ build()
      --build=$CHOST \
      --prefix=/usr \
      --libexecdir=/usr/lib \
-     --with-bugurl=https://bugs.archlinux.org/ \
+     --with-bugurl=https://bugs.parabolagnulinux.org/ \
      --enable-languages=c,c++ \
      --enable-shared \
      --enable-sjlj-exceptions \
diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD
index 842a8352a..e0fc965e6 100644
--- a/community/mingw32-pthreads/PKGBUILD
+++ b/community/mingw32-pthreads/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mingw32-pthreads
 pkgver=2.8.0
 _pkgver=2-8-0
 pkgrel=2
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications."
 license=(LGPL)
 makedepends=('mingw32-gcc-base' 'mingw32-runtime' 'mingw32-w32api')
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index f504cd36b..5da48ee45 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=minidlna
 pkgver=1.0.22
 pkgrel=5
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
 license=('GPL')
 depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite3')
diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD
index 0dd8bdea3..215b5012f 100644
--- a/community/miniupnpc/PKGBUILD
+++ b/community/miniupnpc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=miniupnpc
 pkgver=1.6
 pkgrel=2
 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
 license=('BSD')
 depends=('sh')
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 31dae918c..9c3ca8400 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=miredo
 pkgver=1.2.4
 pkgrel=1
 pkgdesc="Teredo client and server."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
 license=('GPL')
 depends=(judy iproute2)
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index ac48118f0..d8f99ecc3 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mixxx
 pkgver=1.10.0
 pkgrel=1
 pkgdesc="Free, open source software for digital DJ'ing."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mixxx.org'
 license=('GPL')
 depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
diff --git a/community/mktorrent/PKGBUILD b/community/mktorrent/PKGBUILD
index 6eff9a3c4..eb4b379ad 100644
--- a/community/mktorrent/PKGBUILD
+++ b/community/mktorrent/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=mktorrent
 pkgver=1.0
 pkgrel=2
 pkgdesc='Simple command line utility to create BitTorrent metainfo files'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://mktorrent.sourceforge.net/'
 license='GPL'
 depends=('openssl')
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD
index 4d7b7ffb8..1e823cff7 100644
--- a/community/mldonkey/PKGBUILD
+++ b/community/mldonkey/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mldonkey
 pkgver=3.1.0
 pkgrel=1
 pkgdesc="A multi-network P2P client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mldonkey.sourceforge.net/"
 license=('GPL')
 depends=('desktop-file-utils' 'file' 'gd' 'bzip2')
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index e9b0613d3..6e1663b31 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.7.6
 pkgrel=1
 pkgdesc="An open source multimedia framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
 license=('GPL')
 makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
diff --git a/community/mmsrip/PKGBUILD b/community/mmsrip/PKGBUILD
index 19cf7ac6a..752afaffd 100644
--- a/community/mmsrip/PKGBUILD
+++ b/community/mmsrip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mmsrip
 pkgver=0.7.0
 pkgrel=3
 pkgdesc="A downloader for the proprietary protocol MMS://"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nbenoit.tuxfamily.org/projects.php?rq=mmsrip"
 license=('GPL2')
 source=(http://nbenoit.tuxfamily.org/projects/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 2330362dd..e937af513 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mongodb
 pkgver=2.0.2
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
 license=('AGPL3')
 depends=('boost-libs')
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index e92045609..d421c3f6d 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=monit
 pkgver=5.3.1
 pkgrel=1
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mmonit.com/monit/"
 license=('GPL3')
 depends=('openssl')
diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD
index 3b6f9142c..c40b6cc3f 100644
--- a/community/moreutils/PKGBUILD
+++ b/community/moreutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=moreutils
 pkgver=0.45
 pkgrel=2
 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kitenet.net/~joey/code/moreutils.html"
 license=('GPL')
 makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax')
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index 7114817f7..e12f7ee0c 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=motion
 pkgver=3.2.12
 pkgrel=2
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
 depends=('ffmpeg' 'libjpeg' 'v4l-utils')
diff --git a/community/mp3gain/PKGBUILD b/community/mp3gain/PKGBUILD
index 88ba47c5a..da95353fd 100644
--- a/community/mp3gain/PKGBUILD
+++ b/community/mp3gain/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mp3gain
 pkgver=1.5.2
 pkgrel=1
 pkgdesc="Lossless mp3 normalizer with statistical analysis "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mp3gain.sourceforge.net"
 license=("GPL")
 depends=('glibc')
diff --git a/community/mp3info/PKGBUILD b/community/mp3info/PKGBUILD
index 1acf47a00..77f7bb8be 100644
--- a/community/mp3info/PKGBUILD
+++ b/community/mp3info/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mp3info
 pkgver=0.8.5a
 pkgrel=3
 pkgdesc="An MP3 technical info viewer and ID3 1.x tag editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ibiblio.org/mp3info/"
 license=('GPL')
 depends=('ncurses' 'gtk2' )
diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD
index a55ebce67..ec2524860 100644
--- a/community/mp3splt-gtk/PKGBUILD
+++ b/community/mp3splt-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mp3splt-gtk
 pkgver=0.7
 pkgrel=2
 pkgdesc="Split mp3 and ogg files without decoding"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mp3splt.sourceforge.net/"
 license=('GPL')
 depends=('desktop-file-utils' 'gstreamer0.10-ffmpeg' 'gtk2' 'libmp3splt')
diff --git a/community/mp3unicode/PKGBUILD b/community/mp3unicode/PKGBUILD
index 15ad0a5de..83b233c20 100644
--- a/community/mp3unicode/PKGBUILD
+++ b/community/mp3unicode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mp3unicode
 pkgver=1.2
 pkgrel=4
 pkgdesc="A command line utility to convert ID3 tags in mp3 files between different encodings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mp3unicode.yellowsite.ru/"
 license=('GPL')
 depends=('taglib')
diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
index d59e15732..182670fbd 100644
--- a/community/mpdscribble/PKGBUILD
+++ b/community/mpdscribble/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.22
 pkgrel=2
 pkgdesc='An mpd client which submits track info to last.fm'
 url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsoup' 'glib2' 'libmpdclient')
 install='mpdscribble.install'
diff --git a/community/mpgtx/PKGBUILD b/community/mpgtx/PKGBUILD
index 42c9a8080..594af5428 100644
--- a/community/mpgtx/PKGBUILD
+++ b/community/mpgtx/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mpgtx
 pkgver=1.3.1
 pkgrel=3
 pkgdesc="A command line MPEG audio/video/system toolkit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mpgtx.sourceforge.net"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
new file mode 100644
index 000000000..4a4da3547
--- /dev/null
+++ b/community/mplayer2/PKGBUILD
@@ -0,0 +1,93 @@
+# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Bartek Piotrowski <barthalion@gmail.com>
+
+pkgname=mplayer2
+pkgver=2.0.20111101
+pkgrel=1.1
+pkgdesc="A movie player"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.mplayer2.org/"
+if [ "${CARCH}" = "mips64el" ] ; then
+    # OpenGL, VDPAU and XVMC don't have efficient implementations on
+    # the supported mips64el machines.
+    depends=('ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libass' 'fontconfig' 'freetype2'
+        'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' 
+        'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex' 'libxv')
+    makedepends=('live-media' 'p7zip-libre' 'gettext')
+else
+    depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
+        'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' 
+        'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex')
+    makedepends=('live-media' 'mesa' 'p7zip-libre' 'yasm' 'gettext')
+fi
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d')
+options=('!emptydirs')
+
+# source PKGBUILD && mksource
+mksource() {
+  _gitroot="git://git.mplayer2.org/mplayer2.git"
+  _gitname="${pkgname}-${pkgver}"
+
+  if [[ -d "$_gitname" ]]; then
+    cd "$_gitname" && git pull origin
+  else
+    git clone "$_gitroot" "$_gitname"
+  fi
+
+  tar -cJvf ${_gitname}.tar.xz ${_gitname}
+  rm -fr ${_gitname}
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    if [ "$CARCH" = "mips64el" ]; then
+    ./configure --prefix=/usr \
+                --disable-arts \
+                --enable-speex \
+                --disable-openal \
+                --disable-libdv \
+                --disable-musepack \
+                --disable-esd \
+                --disable-mga \
+                --disable-vdpau \
+                --disable-gl \
+                --enable-xv \
+                --language=all \
+                --enable-translation \
+                --confdir=/etc/mplayer
+    else
+    ./configure --prefix=/usr \
+                --enable-runtime-cpudetection \
+                --disable-arts \
+                --enable-speex \
+                --disable-openal \
+                --disable-libdv \
+                --disable-musepack \
+                --disable-esd \
+                --disable-mga \
+                --language=all \
+                --enable-translation \
+                --confdir=/etc/mplayer
+    fi
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    make DESTDIR="${pkgdir}" install
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
+    install -dm755 "${pkgdir}"/usr/share/mplayer/
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
+
+    install -dm755 "${pkgdir}"/usr/share/applications/
+    install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/
+}
diff --git a/community/mtasc/PKGBUILD b/community/mtasc/PKGBUILD
index 30e3284f8..456d7aac7 100644
--- a/community/mtasc/PKGBUILD
+++ b/community/mtasc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtasc
 pkgver=20091229
 pkgrel=3
 pkgdesc="An open source flash (swf) compiler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://mtasc.org/"
 license=('GPL2')
 depends=('zlib')
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 2aacb7fff..b14731b16 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtpaint
 pkgver=3.40
 pkgrel=1
 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mtpaint.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2')
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
index ca99de9c5..67343286d 100644
--- a/community/multipath-tools/PKGBUILD
+++ b/community/multipath-tools/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=multipath-tools
 pkgver=0.4.9
 pkgrel=4
 pkgdesc="Multipath Tools For Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://christophe.varoqui.free.fr/"
 license=('GPL')
 depends=('libaio' 'device-mapper')
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index 7628a460b..640f8c2ef 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=mumble
 pkgver=1.2.3
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('GPL')
 depends=('qt' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse')
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 3f5a016fd..35ef9ac83 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mupdf
 pkgver=0.9
 pkgrel=1
 pkgdesc="lightweight PDF viewer and toolkit written in portable C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mupdf.com"
 license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext')
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index 3284a7811..f1670c20c 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=murmur
 pkgver=1.2.3
 pkgrel=5
 pkgdesc="The voice chat application server for Mumble"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mumble.sourceforge.net"
 license=('GPL')
 depends=('avahi' 'lsb-release' 'protobuf' 'qt>=4.4.0')
diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD
index 3cebcc68a..21c8bf360 100644
--- a/community/musepack-tools/PKGBUILD
+++ b/community/musepack-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=musepack-tools
 pkgver=475
 pkgrel=1
 pkgdesc="Musepack decoder/encoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musepack.net/"
 license=('LGPL')
 depends=('libcuefile' 'libreplaygain')
diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD
index 6894d1b8b..df116ea61 100644
--- a/community/mxml/PKGBUILD
+++ b/community/mxml/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mxml
 pkgver=2.6
 pkgrel=4
 pkgdesc="A small XML parsing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.minixml.org/"
 license=('LGPL')
 source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 16bc6989c..1e4e2374a 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0rc1
 pkgrel=10
 pkgdesc="A multilayer and overlappable GUI System for OGRE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mygui.info/"
 license=('LGPL')
 depends=('boost-libs' 'ogre' 'ois')
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index d12814082..9a4cd35e4 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=myodbc
 pkgver=5.1.9
 pkgrel=2
 pkgdesc="ODBC driver/connector for MySQL"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://dev.mysql.com/downloads/connector/odbc/"
 depends=('unixodbc' 'libmysqlclient')
 license=('GPL')
diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD
index bdb479906..3413dceb2 100644
--- a/community/mypaint/PKGBUILD
+++ b/community/mypaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mypaint
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mypaint.intilinux.com/"
 license=('GPL' 'LGPL')
 depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2')
diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD
index 2b7a4ac14..b8a370db6 100644
--- a/community/mysql++/PKGBUILD
+++ b/community/mysql++/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mysql++
 pkgver=3.1.0
 pkgrel=2
 pkgdesc="A C++ wraper for MySQLs C API"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://tangentsoft.net/mysql++/"
 license=("LGPL" "custom")
 depends=("libmysqlclient")
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 7d6bbfc3d..2097c4310 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=('mythplugins-mytharchive'
 pkgver=0.24.1
 pkgrel=4
 epoch=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
 license=('GPL')
 makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac'
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index 1c8404d90..3c0a58764 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=0.24.1
 pkgrel=4
 epoch=1
 pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org/"
 license=('GPL')
 depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD
index d6464d992..68a832741 100644
--- a/community/naev/PKGBUILD
+++ b/community/naev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=naev
 pkgver=0.5.0
 pkgrel=1
 pkgdesc='2D action/rpg space game'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/naev/"
 license=('GPL3')
 depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data')
diff --git a/community/namazu/PKGBUILD b/community/namazu/PKGBUILD
index a70a36943..2ac8903a7 100644
--- a/community/namazu/PKGBUILD
+++ b/community/namazu/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Namazu is a full-text search engine intended for easy use."
 url="http://namazu.org/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(perl-file-mmagic)
 options=(!libtool)
 source=(http://namazu.org/stable/$pkgname-$pkgver.tar.gz)
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 429204815..47dca2027 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nautilus-actions
 pkgver=3.1.5
 pkgrel=1
 pkgdesc="Configures programs to be launched when files are selected in Nautilus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnome.org"
 license=('GPL')
 depends=('nautilus' 'libunique3' 'libgtop' 'gconf' 'libsm')
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index def409c4c..4b1f3056c 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=nbd
 pkgver=2.9.25
 pkgrel=1
 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nbd.sourceforge.net"
 license=('GPL')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/community/nbtscan/PKGBUILD b/community/nbtscan/PKGBUILD
index f7c2fd2be..22d82c402 100755
--- a/community/nbtscan/PKGBUILD
+++ b/community/nbtscan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nbtscan
 pkgver=1.5.1
 pkgrel=4
 pkgdesc="NBTscan is a program for scanning IP networks for NetBIOS name information."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=(glibc)
 url="http://www.inetcat.net/software/nbtscan.html"
diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD
index 2a61a768d..24876e435 100644
--- a/community/ncdu/PKGBUILD
+++ b/community/ncdu/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc='Disk usage analyzer with an ncurses interface'
 url='http://dev.yorhel.nl/ncdu/'
 license=('custom:MIT')
 depends=('ncurses')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('3d98e78cf7035e32333d263d301d12e9b4352598')
 
diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD
index ecbf1b845..911a9a98c 100644
--- a/community/ncmpcpp/PKGBUILD
+++ b/community/ncmpcpp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ncmpcpp
 pkgver=0.5.8
 pkgrel=2
 pkgdesc="An almost exact clone of ncmpc with some new features."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://unkart.ovh.org/ncmpcpp/"
 license=('GPL')
 depends=('curl' 'libmpdclient' 'taglib' 'ncurses')
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
index df7d0ce45..a110249fe 100644
--- a/community/ndisc6/PKGBUILD
+++ b/community/ndisc6/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ndisc6
 pkgver=1.0.2
 pkgrel=2
 pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/ndisc6/"
 license=("GPL")
 depends=('glibc' 'perl')
diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD
index 003d1bebf..a73e406fb 100644
--- a/community/neatx/PKGBUILD
+++ b/community/neatx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=neatx
 pkgver=0.3.1
 pkgrel=10
 pkgdesc="A free NX server by google"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/neatx/"
 license=('GPL')
 depends=('nxserver' 'python-pexpect' 'python-simplejson' 'netcat' 'pygtk')
diff --git a/community/nemesis/PKGBUILD b/community/nemesis/PKGBUILD
index c299d0158..a8a20da2a 100644
--- a/community/nemesis/PKGBUILD
+++ b/community/nemesis/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nemesis
 pkgver=1.4
 pkgrel=4
 pkgdesc="command-line network packet crafting and injection utility"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://nemesis.sourceforge.net/"
 license=('BSD')
 depends=()
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD
index f0ebc38e4..31aa03d18 100644
--- a/community/net6/PKGBUILD
+++ b/community/net6/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=net6
 pkgver=1.3.12
 pkgrel=2
 pkgdesc="A library that provides a TCP protocol abstraction for C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de/"
 license=('LGPL')
 depends=('gnutls' 'libsigc++2.0')
diff --git a/community/netbrake/PKGBUILD b/community/netbrake/PKGBUILD
index 3b2e4d053..0201d3ecc 100644
--- a/community/netbrake/PKGBUILD
+++ b/community/netbrake/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netbrake
 pkgver=0.2
 pkgrel=3
 pkgdesc="Netbrake is an utility to limit the bandwidth used by a process"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.hping.org/netbrake/"
 license=('GPL')
 depends=(glibc)
diff --git a/community/nethack/PKGBUILD b/community/nethack/PKGBUILD
index a3da43710..a8b3a3279 100644
--- a/community/nethack/PKGBUILD
+++ b/community/nethack/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=nethack
 pkgver=3.4.3
 pkgrel=6
 pkgdesc='A single player dungeon exploration game'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nethack.org/index.html"
 license=('custom')
 depends=('ncurses' 'gzip')
diff --git a/community/nethogs/PKGBUILD b/community/nethogs/PKGBUILD
index 2c2567195..b6df770a7 100644
--- a/community/nethogs/PKGBUILD
+++ b/community/nethogs/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="A net top tool which displays traffic used per process instead of per I
 url="http://nethogs.sourceforge.net"
 license=(GPL)
 depends=(libpcap ncurses gcc-libs)
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc44.patch)
 md5sums=('d6fb12b46e80a50c9b9f91dd48e2b234'
          '62eb824fbbadd1c60d0749593c16d293')
diff --git a/community/netstat-nat/PKGBUILD b/community/netstat-nat/PKGBUILD
index c6785d714..e9a687f50 100644
--- a/community/netstat-nat/PKGBUILD
+++ b/community/netstat-nat/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Small program written in C displaying NAT connections, managed by netfilter."
 url="http://tweegy.nl/projects/netstat-nat/"
 license=("GPL")
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=(iptables)
 source=(http://tweegy.nl/download/netstat-nat-$pkgver.tar.gz)
 md5sums=('c1bbb3ee9774ebfa27c440e2d9dd7286')
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index beddbb372..e4b0104e9 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=netsurf
 pkgver=2.8
 pkgrel=2
 pkgdesc="Lightweight and fast web browser"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netsurf-browser.org/"
 license=('GPL')
 depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub')
diff --git a/community/netwatch/PKGBUILD b/community/netwatch/PKGBUILD
index 13953b968..5beed0a69 100644
--- a/community/netwatch/PKGBUILD
+++ b/community/netwatch/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=netwatch
 pkgver=1.3.0
 pkgrel=2
 pkgdesc="monitor network connections"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.slctech.org/~mackay/NETWATCH/netwatch.html"
 license=('GPL')
 options=(zipman)
diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD
index 52509e5b3..bccd78bed 100644
--- a/community/newsbeuter/PKGBUILD
+++ b/community/newsbeuter/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=newsbeuter
 pkgver=2.4
 pkgrel=1
 pkgdesc="A RSS feed reader for the text console with special Podcast support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.newsbeuter.org/"
 license=('custom: MIT')
 depends=('curl' 'libxml2' 'sqlite3' 'stfl')
diff --git a/community/newton-dynamics/PKGBUILD b/community/newton-dynamics/PKGBUILD
index defe9db75..5456ebce7 100644
--- a/community/newton-dynamics/PKGBUILD
+++ b/community/newton-dynamics/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=newton-dynamics
 pkgver=2.33
 pkgrel=2
 pkgdesc="A simple physics API"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.newtondynamics.com"
 license=('custom')
 depends=()
diff --git a/community/nexuiz/PKGBUILD b/community/nexuiz/PKGBUILD
index 2471fe8ec..3123ad9b0 100644
--- a/community/nexuiz/PKGBUILD
+++ b/community/nexuiz/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=nexuiz
 pkgver=2.5.2
 _zipver=252
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="a free, open-source first person shooter"
 url="http://www.nexuiz.com/"
 license=("GPL")
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 84b951d14..d0ccddf3d 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nginx
 pkgver=1.0.11
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre' 'zlib' 'openssl')
 makedepends=('passenger')
 optdepends=('passenger')
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index fa3c151d6..d2079fd86 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ngircd
 pkgver=18
 pkgrel=1
 pkgdesc="Next Generation IRC Daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 backup=(etc/ngircd.conf)
 url="http://ngircd.barton.de/"
 license=('GPL')
diff --git a/community/ngrep/PKGBUILD b/community/ngrep/PKGBUILD
index 085b842b3..f10f7054c 100644
--- a/community/ngrep/PKGBUILD
+++ b/community/ngrep/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ngrep
 pkgver=1.45
 pkgrel=7
 pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ngrep.sourceforge.net/'
 license=('custom')
 depends=('libpcap>=1.0.0')
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index 9bf37940b..54acc8f53 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'libedit')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz")
 sha1sums=('65fa23d1168cb3af7651b990344f763c77bf6132')
diff --git a/community/nickle/PKGBUILD b/community/nickle/PKGBUILD
index 1e511b630..cff5a8fcb 100644
--- a/community/nickle/PKGBUILD
+++ b/community/nickle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nickle
 pkgver=2.70
 pkgrel=1
 pkgdesc="A programming language based prototyping environment with powerful programming and scripting capabilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nickle.org"
 license=('custom')
 depends=('readline')
diff --git a/community/nload/PKGBUILD b/community/nload/PKGBUILD
index 2518e64ee..1a5ea0e3d 100644
--- a/community/nload/PKGBUILD
+++ b/community/nload/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc='Console application which monitors network traffic and bandwidth usage
 url='http://www.roland-riegel.de/nload'
 license=('GPL2')
 depends=('ncurses' 'gcc-libs')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("$url/$pkgname-$pkgver.tar.gz")
 md5sums=('9b97c37fe1474f1da42f265fead24081')
 
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 8ec1be501..736d2ebb9 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=nodejs
 pkgver=0.6.8
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://nodejs.org/'
 license=('MIT')
 depends=('python2')
diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD
index 4ed673e68..55050d40c 100644
--- a/community/noip/PKGBUILD
+++ b/community/noip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=noip
 pkgver=2.1.9
 pkgrel=2
 pkgdesc="A Dynamic DNS Client Updater for no-ip.com services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.no-ip.com/downloads.php?page=linux"
 license=('GPL')
 backup=('etc/no-ip2.conf')
diff --git a/community/nrg2iso/PKGBUILD b/community/nrg2iso/PKGBUILD
index 493bfb4ff..a0c40c1b3 100644
--- a/community/nrg2iso/PKGBUILD
+++ b/community/nrg2iso/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nrg2iso
 pkgver=0.4
 pkgrel=7
 pkgdesc="Utility for converting CD or DVD image generated by Nero Burning Rom to ISO format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
 license=('GPL')
 depends=('glibc')
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index abd455dbb..09df8c6d1 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -11,7 +11,7 @@ url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
 depends=('openssl')
 makedepends=('flex')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('66e17e5801e94da1a21f0f2a4dd7a4ab4ffe0dd9')
 
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index a44a800cd..10fcf8ede 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ntop
 pkgver=4.1.0
 pkgrel=2
 pkgdesc='A network traffic probe that shows the network usage.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ntop.org/'
 license=('GPL')
 depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
diff --git a/community/numlockx/PKGBUILD b/community/numlockx/PKGBUILD
index 48787c9fa..dac173233 100644
--- a/community/numlockx/PKGBUILD
+++ b/community/numlockx/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=numlockx
 pkgver=1.2
 pkgrel=2
 pkgdesc='Turns on the numlock key in X11.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 url='http://home.kde.org/~seli/numlockx/'
 depends=('libxtst')
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
index d98fa95df..efe7ae2d5 100644
--- a/community/nut/PKGBUILD
+++ b/community/nut/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
 url='http://nut.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
 md5sums=('1b18b9fab54a778f21ee4cd95fca5c63')
 
diff --git a/community/nvclock/PKGBUILD b/community/nvclock/PKGBUILD
index 4eda3735f..d3a09a670 100644
--- a/community/nvclock/PKGBUILD
+++ b/community/nvclock/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nvclock
 pkgver=0.8b4
 pkgrel=2
 pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxhardware.org/nvclock/'
 license=('GPL')
 depends=('gtk2')
diff --git a/community/nvdock/PKGBUILD b/community/nvdock/PKGBUILD
index e9d52f4a4..cd8728d08 100644
--- a/community/nvdock/PKGBUILD
+++ b/community/nvdock/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nvdock
 pkgver=1.02
 pkgrel=4
 pkgdesc="A tray icon for easy launching of the NVIDIA control panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.opsat.net/user/bob/projects/nvdock"
 license=('BSD')
 depends=('gtk2')
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index f61ad81cf..a395c7a34 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nzbget
 pkgver=0.7.0
 pkgrel=3
 pkgdesc="Downloads from Usenet using .nzb files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nzbget.sourceforge.net/"
 license=('GPL')
 depends=('gnutls' 'libpar2' 'libxml2' 'ncurses')
diff --git a/community/obby/PKGBUILD b/community/obby/PKGBUILD
index d10bf6798..ea0103504 100644
--- a/community/obby/PKGBUILD
+++ b/community/obby/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="A library which provides synced document buffers"
 url="http://gobby.0x539.de"
 options=('!libtool')
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('net6' 'avahi' 'libsigc++')
 source=(http://releases.0x539.de/obby/obby-$pkgver.tar.gz)
 md5sums=('33fac4228c1efc1a1635bacf6480dc31')
diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index b1c34b3d1..fb57106b7 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=obconf
 pkgver=2.0.3.git20100309
 pkgrel=2
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org/wiki/ObConf:About"
 license=('GPL')
 depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
diff --git a/community/obexfs/PKGBUILD b/community/obexfs/PKGBUILD
index 3e1d404a1..c2c172748 100644
--- a/community/obexfs/PKGBUILD
+++ b/community/obexfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=obexfs
 pkgver=0.12
 pkgrel=2
 pkgdesc="FUSE based filesystem using ObexFTP (currently beta)."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openobex.triq.net/obexfs"
 license=('GPL')
 source=(http://triq.net/obexftp/$pkgname-$pkgver.tar.gz)
diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD
index 873587f5d..215a4ffb7 100644
--- a/community/ocaml-findlib/PKGBUILD
+++ b/community/ocaml-findlib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ocaml-findlib
 pkgver=1.2.7
 pkgrel=2
 license=('MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Objective Caml (OCaml) package manager"
 url="http://projects.camlcity.org/projects/findlib.html"
 depends=('ocaml')
diff --git a/community/ogle-gui/PKGBUILD b/community/ogle-gui/PKGBUILD
index 2c8d95b91..a5ead3a9b 100644
--- a/community/ogle-gui/PKGBUILD
+++ b/community/ogle-gui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ogle-gui
 pkgver=0.9.2
 pkgrel=5
 pkgdesc="A gtk2 gui for ogle"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dtek.chalmers.se/groups/dvd/"
 license=('GPL')
 depends=('ogle' 'libglade')
diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD
index 8d157decc..59464ecff 100644
--- a/community/ogmrip/PKGBUILD
+++ b/community/ogmrip/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ogmrip
 pkgver=0.13.7
 pkgrel=2
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ogmrip.sourceforge.net/"
 license=('GPL')
 depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkgconfig' 'gconf' 'libglade' 'libnotify' 'enchant')
diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index da509f959..8cbc50307 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=oidentd
 pkgver=2.0.8
 pkgrel=4
 pkgdesc="oidentd is an ident (rfc1413 compliant) daemon that runs on Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/ois/PKGBUILD b/community/ois/PKGBUILD
index 9ba2d73e2..f410caaa9 100644
--- a/community/ois/PKGBUILD
+++ b/community/ois/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ois
 pkgver=1.3
 pkgrel=1
 pkgdesc="Object Oriented Input System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/wgois"
 license=('zlib/libpng')
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'libxaw')
diff --git a/community/omniorb/PKGBUILD b/community/omniorb/PKGBUILD
index 0102fb639..97dfd8f24 100644
--- a/community/omniorb/PKGBUILD
+++ b/community/omniorb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=omniorb
 pkgver=4.1.6
 pkgrel=1
 pkgdesc="A CORBA object request broker for C++ and Python."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://omniorb.sourceforge.net/"
 license=('GPL2' 'LGPL2')
 depends=('gcc-libs' 'python2' 'openssl')
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index 2b7803a04..08f9e0d71 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=oolite
 pkgver=1.76
 pkgrel=1
 pkgdesc="A space-sim based on the classic Elite"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oolite-linux.berlios.de"
 license=('GPL2')
 depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu')
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 9134e0841..d0ce60605 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2011.12.20
 _pkgsubver=562307
 pkgrel=3
 pkgdesc="kernel modules for the open source implementation of VMware Tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
 license=('GPL')
 makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers')
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 4c2d56970..5be5138ce 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2011.12.20
 _pkgsubver=562307
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
 license=('LGPL')
 depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'glib2' 'uriparser' 'libsigc++' 'libxss')
diff --git a/community/openarena/PKGBUILD b/community/openarena/PKGBUILD
index 128c30cba..6a730239b 100644
--- a/community/openarena/PKGBUILD
+++ b/community/openarena/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.8.5
 _oldver=0.8.1
 pkgrel=4
 pkgdesc="A violent, sexy, multiplayer first person shooter based on the ioquake3 engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openarena.ws/"
 license=('GPL')
 depends=('sdl' 'libvorbis' 'curl' 'openarena-data')
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 9241dabf8..bc424cf0a 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openbox
 pkgver=3.5.0
 pkgrel=4
 pkgdesc="A window manager for the X11 windowing system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org"
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD
index 6c2899eb8..a1cf3b666 100644
--- a/community/openbsd-netcat/PKGBUILD
+++ b/community/openbsd-netcat/PKGBUILD
@@ -4,21 +4,22 @@
 
 pkgname="openbsd-netcat"
 pkgver=1.89
-pkgrel=4
+_pkgrel=4
+pkgrel=4.1
 pkgdesc="TCP/IP swiss army knife. OpenBSD variant."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/netcat-openbsd"
 license=('BSD')
 depends=('glib2')
-makedepends=('gcc' 'make')
+makedepends=('gcc' 'make' 'pkg-config')
 source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz"
-	"http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${pkgrel}.diff.gz")
+	"http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_pkgrel}.diff.gz")
 md5sums=('7238ce15aae43069e96ba7faf03f153e'
          '00c65aa22243b76998174c733cbb64cc')
 
 build() {
 	cd $srcdir/netcat-openbsd-${pkgver}.orig
-	patch -p1 < ../netcat-openbsd_${pkgver}-${pkgrel}.diff
+	patch -p1 < ../netcat-openbsd_${pkgver}-${_pkgrel}.diff
 	for i in `cat debian/patches/series`
 	do
 		echo "** patch $i" 1>&2
diff --git a/community/openlierox/PKGBUILD b/community/openlierox/PKGBUILD
index f0ece7215..3580262d1 100644
--- a/community/openlierox/PKGBUILD
+++ b/community/openlierox/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openlierox
 pkgver=0.58_rc3
 pkgrel=3
 pkgdesc="A real-time excessive Worms-clone"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openlierox.net/"
 license=('LGPL')
 depends=('curl' 'gcc-libs' 'sdl_image' 'sdl_mixer' 'gd' 'hawknl' 'libxml2' 'libzip')
diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD
index de442f87d..0b5371b85 100644
--- a/community/openmotif/PKGBUILD
+++ b/community/openmotif/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openmotif
 pkgver=2.3.3
 pkgrel=1
 pkgdesc="Open Motif"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.motifzone.org/"
 license=('GPL')
 depends=(libxext libxp libxft libxt libxmu libpng libjpeg)
diff --git a/community/openmovieeditor/PKGBUILD b/community/openmovieeditor/PKGBUILD
index cef330b33..98716a99b 100644
--- a/community/openmovieeditor/PKGBUILD
+++ b/community/openmovieeditor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openmovieeditor
 pkgver=0.0.20090105
 pkgrel=8
 pkgdesc="A simple video editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
 depends=('libquicktime' 'libsamplerate' 'fltk' 'jack'
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 3d9ba5ab7..103c77db0 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.9p1
 pkgrel=13
 pkgdesc="Free, easy to use implementation of the Network Time Protocol."
 url="http://www.openntpd.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('openssl')
 backup=('etc/ntpd.conf' 'etc/conf.d/openntpd')
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 7b5cce6c0..3b8f76894 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=openscenegraph
 pkgver=3.0.1
 pkgrel=3
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:OSGPL')
 url="http://www.openscenegraph.org"
 depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index d35668224..0c4141d22 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -18,7 +18,7 @@ optdepends=('postgresql-libs'
 backup=("etc/opensips/opensips.cfg"
 	"etc/opensips/dictionary.radius"
 	"etc/opensips/opensipsctlrc")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 install=opensips.install
 options=('!emptydirs' 'zipman' '!makeflags' 'docs')
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 0c535b58e..848c6e3b5 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openssh-askpass
 pkgver=1.3.2
 pkgrel=2
 pkgdesc='A plasma-like passphrase dialog for ssh'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1'
 license=('GPL')
 depends=('openssh' 'qt')
diff --git a/community/openthreads/PKGBUILD b/community/openthreads/PKGBUILD
index e65ef6aab..7478fd4e9 100644
--- a/community/openthreads/PKGBUILD
+++ b/community/openthreads/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openthreads
 pkgver=2.3.0
 pkgrel=1
 pkgdesc="A  minimal & complete Object-Oriented thread interface for C++ programmers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openthreads.sourceforge.net"
 license=("LGPL")
 depends=('gcc-libs')
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index a17e7c43d..b9c1ee579 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=openttd
 pkgver=1.1.4
 pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.openttd.org'
 license=('GPL')
 depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils')
diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD
index 86d456678..73c31acad 100644
--- a/community/optipng/PKGBUILD
+++ b/community/optipng/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=optipng
 pkgver=0.6.5
 pkgrel=2
 pkgdesc='Compresses PNG files to a smaller size, without losing any information.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://optipng.sourceforge.net/'
 license=('ZLIB')
 depends=('glibc')
diff --git a/community/orange/PKGBUILD b/community/orange/PKGBUILD
index e6c6f982b..0a19f823c 100644
--- a/community/orange/PKGBUILD
+++ b/community/orange/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=orange
 pkgver=0.4
 pkgrel=3
 pkgdesc="a helper tool for synce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=("GPL")
 depends=('dynamite' 'synce-libsynce' 'file' 'unshield')
diff --git a/community/osdbattery/PKGBUILD b/community/osdbattery/PKGBUILD
index 62eced75b..a9b0a1ab5 100644
--- a/community/osdbattery/PKGBUILD
+++ b/community/osdbattery/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=osdbattery
 pkgver=1.4
 pkgrel=3
 pkgdesc="Displays battery information in the OSD style"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://osdbattery.sourceforge.net"
 license=("GPL2")
 depends=('xosd')
diff --git a/community/osec/PKGBUILD b/community/osec/PKGBUILD
index 0f0a7a96d..9d4d49ff5 100644
--- a/community/osec/PKGBUILD
+++ b/community/osec/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=osec
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="lightweight integrity checking system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://o-security.sourceforge.net/"
 license=("GPL")
 makedepends=(help2man tinycdb)
diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD
index d47dd7c94..3447089dd 100644
--- a/community/osiris/PKGBUILD
+++ b/community/osiris/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=osiris
 pkgver=4.2.3
 pkgrel=3
 pkgdesc="A file integrity management system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://osiris.shmoo.com/"
 license=('custom')
 depends=('openssl' 'readline')
diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD
index 85cd6cf49..729d57143 100644
--- a/community/osmo/PKGBUILD
+++ b/community/osmo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=osmo
 pkgver=0.2.10
 pkgrel=5
 pkgdesc="A handy personal organizer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clayo.org/osmo/"
 license=('GPL')
 depends=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify'  'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2')
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index 076e17329..687c33f1a 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=oss
 pkgver=4.2_2005
 pkgrel=2
 pkgdesc="Open Sound System UNIX audio architecture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.opensound.com/"
 license=('GPL2')
 depends=('gcc' 'make' 'kernel26-headers' 'module-init-tools' 'libtool' 'sed')
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index a8a42445f..54bf5564c 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ozerocdoff
 pkgver=2
 pkgrel=6
 pkgdesc="Userspace driver for Option High Speed Mobile Devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pharscape.org/ozerocdoff.html"
 depends=('bash' 'libusb-compat')
 license=('GPL2')
diff --git a/community/p2c/PKGBUILD b/community/p2c/PKGBUILD
index 027f78819..ddac30ed1 100644
--- a/community/p2c/PKGBUILD
+++ b/community/p2c/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=p2c
 pkgver=1.21alpha2
 pkgrel=9
 pkgdesc="pascal to c/c++ converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/p2c"
 license=('GPL')
 depends=('perl')
diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD
index 407feff1b..21ed7fa99 100644
--- a/community/p3scan/PKGBUILD
+++ b/community/p3scan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=p3scan
 pkgver=2.3.2
 pkgrel=5
 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://p3scan.sourceforge.net/"
 depends=('pcre' 'openssl')
 license=('GPL')
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 5638b68d5..b29373993 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
 pkgver=0.6.21
 pkgrel=2
 pkgdesc="A system designed to make installation and updates of packages easier."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
 license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
diff --git a/community/paco/PKGBUILD b/community/paco/PKGBUILD
index 4b9462466..cbecb9018 100644
--- a/community/paco/PKGBUILD
+++ b/community/paco/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=paco
 pkgver=2.0.9
 pkgrel=1
 pkgdesc="LFS packet manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://paco.sourceforge.net/index.html"
 license=('GPL')
 #NOTE: You may disable gtk frontend in configure
diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD
index 5c9798514..49647afef 100644
--- a/community/pam-krb5/PKGBUILD
+++ b/community/pam-krb5/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pam-krb5
 pkgver=4.4
 pkgrel=2
 pkgdesc='A PAM module providing Kerberos v5 support.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.eyrie.org/~eagle/software/pam-krb5/'
 license=('custom')
 options=('!libtool')
diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD
index 6d46854a7..d27ce1bcd 100644
--- a/community/pam_mysql/PKGBUILD
+++ b/community/pam_mysql/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pam_mysql
 pkgver=0.7RC1
 pkgrel=4
 pkgdesc="A PAM module to authenticate users against mysql."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://pam-mysql.sourceforge.net"
 depends=('pam' 'mysql' 'openssl')
diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD
index 7ef36f88c..249e18824 100644
--- a/community/pam_pwcheck/PKGBUILD
+++ b/community/pam_pwcheck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pam_pwcheck
 pkgver=3.9
 pkgrel=3
 pkgdesc="A password strength checking module for PAM-aware password changing programs"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.thkukuk.de/pam/pam_pwcheck/"
 depends=('pam')
 license=('GPL')
diff --git a/community/parano/PKGBUILD b/community/parano/PKGBUILD
index 5f773d17c..41855fec5 100644
--- a/community/parano/PKGBUILD
+++ b/community/parano/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=parano
 pkgver=0.3.5
 pkgrel=4
 pkgdesc="A GNOME frontend for creating/editing/checking MD5 and SFV files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://parano.berlios.de"
 license=('GPL')
 depends=('gnome-python' 'shared-mime-info')
diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index cf71d6d81..ec065a902 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=paraview
 pkgver=3.12.0
 pkgrel=2
 pkgdesc='Parallel Visualization Application using VTK'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/paraview/fix-boost-graph-api-changes.diff b/community/paraview/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 37d78665b..000000000
--- a/community/paraview/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date:   Tue Dec 13 15:36:06 2011 -0500
-
-    BUG: 12772 fixes for change in Boost graph API
-
-    This fixes bug 12772, where an API change in Boost was causing
-    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
-    reporting the issue and posting the patch.
-
-    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
-
-
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+    return e.underlying_desc.Id;
-+  }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
-
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
--    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+                                  unwrap_edge_id(e), tree_e.Id);
-   }
-
- private:
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index 07f753d2a..7d7a812ff 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=parcellite
 pkgver=1.0.2rc5
 pkgrel=1
 pkgdesc="Lightweight GTK+ clipboard manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://parcellite.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2')
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index 770b1133c..01d2fc6d9 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pari
 pkgver=2.5.0
 pkgrel=2
 pkgdesc='Computer algebra system designed for fast computations in number theory'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pari.math.u-bordeaux.fr/'
 license=('GPL')
 depends=('gmp' 'readline' 'libx11')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 0f0d9d4be..5c5fcf876 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.0.0
 _rel=stable
 pkgrel=2
 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.parrotcode.org/"
 license=('GPL')
 depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl' 'libffi')
diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD
index d3923a9a3..9f8737f5f 100644
--- a/community/partimage/PKGBUILD
+++ b/community/partimage/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=partimage
 pkgver=0.6.9
 pkgrel=1
 pkgdesc='Partition Image saves partitions in many formats to an image file.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.partimage.org/'
 license=('GPL')
 depends=('libnewt' 'lzo' 'bzip2' 'openssl')
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 4fcab1d40..a1181cbb5 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.0.11
 pkgrel=1
 _pkgdlnr=75548
 pkgdesc="mod_rails passenger"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
 license=('GPL')
 depends=('apache' 'ruby' 'ruby-rack' 'curl')
diff --git a/community/patchage/PKGBUILD b/community/patchage/PKGBUILD
index e7c6516a0..033929668 100644
--- a/community/patchage/PKGBUILD
+++ b/community/patchage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=patchage
 pkgver=0.5.0
 pkgrel=2
 pkgdesc="A modular patch bay for audio and MIDI systems"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://drobilla.net/software/patchage"
 license=('GPL')
 depends=('dbus-glib' 'libglademm' 'hicolor-icon-theme'
diff --git a/community/patchutils/PKGBUILD b/community/patchutils/PKGBUILD
index 3e5ae4270..d7c3ec534 100644
--- a/community/patchutils/PKGBUILD
+++ b/community/patchutils/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="A small collection of programs that operate on patch files"
 license=('GPL')
 url="http://cyberelk.net/tim/patchutils/"
 depends=('perl')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://cyberelk.net/tim/data/patchutils/stable/$pkgname-$pkgver.tar.bz2)
 md5sums=('74607b4a28c9009c6aeeed0e91098917')
 
diff --git a/community/pawm/PKGBUILD b/community/pawm/PKGBUILD
index af37c7df9..7e452bd3b 100644
--- a/community/pawm/PKGBUILD
+++ b/community/pawm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pawm
 pkgver=2.3.0
 pkgrel=1
 pkgdesc="Puto Amo Window Manager is a full featured window manager, but without useless bells and whistles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pleyades.net/pawm/"
 license=("GPL")
 depends=('libxft' 'libxpm' 'libxrandr')
diff --git a/community/pbzip2/PKGBUILD b/community/pbzip2/PKGBUILD
index 84f522e64..8cf2f8700 100644
--- a/community/pbzip2/PKGBUILD
+++ b/community/pbzip2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pbzip2
 pkgver=1.1.6
 pkgrel=1
 pkgdesc="Parallel implementation of the bzip2 block-sorting file compressor"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://compression.ca/pbzip2/"
 license=('BSD')
 depends=('bzip2' 'gcc-libs')
diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD
index 092d2aa4b..1880c5743 100644
--- a/community/pcmanfm/PKGBUILD
+++ b/community/pcmanfm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pcmanfm
 pkgver=0.9.10
 pkgrel=1
 pkgdesc="File manager of the LXDE Desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pcmanfm.sourceforge.net/"
 license=('GPL')
 groups=('lxde')
diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD
index 91fdcc270..94dceea86 100644
--- a/community/pcsc-perl/PKGBUILD
+++ b/community/pcsc-perl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pcsc-perl
 pkgver=1.4.12
 pkgrel=2
 pkgdesc="A Perl Module for PC/SC SmartCard access"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
 license=('GPL' 'PerlArtistic')
 depends=('pcsclite' 'perl')
diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD
index f16ea860b..510ffeff2 100644
--- a/community/pcsc-tools/PKGBUILD
+++ b/community/pcsc-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pcsc-tools
 pkgver=1.4.18
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
 license=('GPL')
 depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl')
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 20c5f045c..6c213550c 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pcsclite
 pkgver=1.8.1
 pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://alioth.debian.org/projects/pcsclite/"
 license=('BSD')
 depends=('udev')
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
new file mode 100644
index 000000000..09c3ca5ed
--- /dev/null
+++ b/community/pcsxr/PKGBUILD
@@ -0,0 +1,28 @@
+## Maintainer: schuay <jakob.gruber@gmail.com>
+## Contributor: quantax -- contact via Arch Linux forum or AUR
+## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=pcsxr
+pkgver=1.9.92
+pkgrel=3
+pkgdesc='A Sony PlayStation emulator based on the PCSX-df Project'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://pcsxr.codeplex.com/'
+license=('GPL')
+depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa')
+conflicts=('pcsx-df')
+_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)"
+source=($pkgname-$pkgver.tar.bz2::$_pkgurl)
+md5sums=('28411aed0b4424f97227d94bdefaec83')
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    ./configure --prefix=/usr --enable-libcdio --enable-opengl
+    make
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+}
+
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index a1376c92c..7e30d453c 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pdf2djvu
 pkgver=0.7.11
 pkgrel=3
 pkgdesc="Creates DjVu files from PDF files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pdf2djvu.googlecode.com"
 license=('GPL')
 depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs')
diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD
index c15c7af0f..c20098d2a 100644
--- a/community/pdf2svg/PKGBUILD
+++ b/community/pdf2svg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pdf2svg
 pkgver=0.2.1
 pkgrel=6
 pkgdesc="A pdf to svg converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cityinthesky.co.uk/pdf2svg.html"
 license=('GPL')
 depends=('poppler-glib' 'gtk2' 'glib2')
diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD
index 4da652f91..47e6293fa 100644
--- a/community/pdfedit/PKGBUILD
+++ b/community/pdfedit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pdfedit
 pkgver=0.4.5
 pkgrel=2
 pkgdesc='Full featured editor for manipulating PDF documents'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pdfedit.petricek.net/index_e.html'
 license=('GPL')
 depends=('qt3' 't1lib' 'gsfonts')
diff --git a/community/pdmenu/PKGBUILD b/community/pdmenu/PKGBUILD
index bbd53cee0..9b79ad428 100644
--- a/community/pdmenu/PKGBUILD
+++ b/community/pdmenu/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pdmenu
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="simple full screen menu program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/unstable/source/pdmenu"
 license=('GPL')
 depends=('gpm' 'slang')
diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD
index f73b30940..3b6a0d55a 100644
--- a/community/pdnsd/PKGBUILD
+++ b/community/pdnsd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pdnsd
 pkgver=1.2.8
 pkgrel=1
 pkgdesc="Is a proxy DNS server with permanent caching"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.phys.uu.nl/~rombouts/pdnsd/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index ba8c7a3db..03f87e9e6 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=performous
 pkgver=0.6.1
 pkgrel=11
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://performous.org/"
 license=('GPL')
 depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 654211678..d7c38b5d6 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-berkeleydb
 pkgver=0.50
 pkgrel=2
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/BerkeleyDB/"
 license=('GPL' 'PerlArtistic')
 depends=('perl' 'db')
diff --git a/community/perl-class-data-inheritable/PKGBUILD b/community/perl-class-data-inheritable/PKGBUILD
index 279d6da79..31173e5b0 100644
--- a/community/perl-class-data-inheritable/PKGBUILD
+++ b/community/perl-class-data-inheritable/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-class-data-inheritable
 pkgver=0.08
 pkgrel=4
 pkgdesc="Inheritable, overridable class data "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Class-Data-Inheritable"
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
diff --git a/community/perl-class-factory-util/PKGBUILD b/community/perl-class-factory-util/PKGBUILD
index d22f619c9..e42ba31e7 100644
--- a/community/perl-class-factory-util/PKGBUILD
+++ b/community/perl-class-factory-util/PKGBUILD
@@ -5,7 +5,7 @@ _realname=Class-Factory-Util
 pkgver=1.7
 pkgrel=3
 pkgdesc="Provide utility methods for factory classes"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'Artistic')
 url="http://search.cpan.org/~drolsky/Class-Factory-Util"
 options=(!emptydirs)
diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD
index 9896a9d33..def16e65f 100644
--- a/community/perl-class-methodmaker/PKGBUILD
+++ b/community/perl-class-methodmaker/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-class-methodmaker
 pkgver=2.18
 pkgrel=4
 pkgdesc="Create generic class methods"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Class-MethodMaker"
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD
index ede090293..a2ae2b1a7 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-clone
 pkgver=0.31
 pkgrel=3
 pkgdesc='Recursive copy of nested objects.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://search.cpan.org/~RDF/Clone'
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD
index 204a0d0f9..a45d200e7 100644
--- a/community/perl-crypt-blowfish/PKGBUILD
+++ b/community/perl-crypt-blowfish/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-blowfish
 pkgver=2.12
 pkgrel=3
 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Crypt-Blowfish"
 license=("GPL" "PerlArtistic")
 source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz")
diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD
index ae854b92b..43982fb94 100644
--- a/community/perl-crypt-des/PKGBUILD
+++ b/community/perl-crypt-des/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=perl-crypt-des
 pkgver=2.05
 pkgrel=3
 pkgdesc="Perl DES encryption module"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~dparis/Crypt-DES"
 license=("GPL" "PerlArtistic")
 depends=('glibc')
diff --git a/community/perl-crypt-openssl-bignum/PKGBUILD b/community/perl-crypt-openssl-bignum/PKGBUILD
index 33f382066..721249b20 100644
--- a/community/perl-crypt-openssl-bignum/PKGBUILD
+++ b/community/perl-crypt-openssl-bignum/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-crypt-openssl-bignum
 pkgver=0.04
 pkgrel=5
 pkgdesc="OpenSSL's multiprecision integer arithmetic "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum"
 depends=('perl' 'openssl')
 license=('GPL')
diff --git a/community/perl-crypt-openssl-random/PKGBUILD b/community/perl-crypt-openssl-random/PKGBUILD
index b9a8adb52..d66f44187 100644
--- a/community/perl-crypt-openssl-random/PKGBUILD
+++ b/community/perl-crypt-openssl-random/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-crypt-openssl-random
 pkgver=0.04
 pkgrel=5
 pkgdesc="Interface to OpenSSL PRNG methods"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Crypt-OpenSSL-Random"
 depends=('perl' 'openssl')
 license=('GPL')
diff --git a/community/perl-crypt-openssl-rsa/PKGBUILD b/community/perl-crypt-openssl-rsa/PKGBUILD
index dcedd07a7..9fe5c09c8 100644
--- a/community/perl-crypt-openssl-rsa/PKGBUILD
+++ b/community/perl-crypt-openssl-rsa/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-crypt-openssl-rsa
 pkgver=0.28
 pkgrel=1
 pkgdesc="Interface to OpenSSL RSA methods"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA"
 depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum')
 license=('GPL')
diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD
index 629c01041..fb82f9368 100644
--- a/community/perl-curses/PKGBUILD
+++ b/community/perl-curses/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-curses
 pkgver=1.28
 pkgrel=3
 pkgdesc="Character screen handling and windowing"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Curses"
 license=('GPL' 'PerlArtistic')
 depends=('perl' 'ncurses')
diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD
index 765098374..840da26ba 100644
--- a/community/perl-data-structure-util/PKGBUILD
+++ b/community/perl-data-structure-util/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-data-structure-util
 pkgver=0.15
 pkgrel=4
 pkgdesc="Perl/CPAN Module Data::Structure::Util"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Data-Structure-Util"
 license=("GPL" "PerlArtistic")
 source=("http://search.cpan.org/CPAN/authors/id/A/AN/ANDYA/Data-Structure-Util-$pkgver.tar.gz")
diff --git a/community/perl-datetime-format-builder/PKGBUILD b/community/perl-datetime-format-builder/PKGBUILD
index 094777a66..940d700a3 100644
--- a/community/perl-datetime-format-builder/PKGBUILD
+++ b/community/perl-datetime-format-builder/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-datetime-format-builder
 pkgver=0.8000
 pkgrel=5
 pkgdesc="Create DateTime parser classes and objects"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
 provides=('perl-datetime-format-builder=0.80')
diff --git a/community/perl-datetime-format-mail/PKGBUILD b/community/perl-datetime-format-mail/PKGBUILD
index dc6c69605..c2e9758d1 100644
--- a/community/perl-datetime-format-mail/PKGBUILD
+++ b/community/perl-datetime-format-mail/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-datetime-format-mail
 pkgver=0.3001
 pkgrel=7
 pkgdesc="Convert between DateTime and RFC2822/822 formats "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DateTime-Format-Mail"
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0' 'perl-datetime' 'perl-params-validate>=0.67')
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index c4e8f7235..19a115798 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-datetime
 pkgver=0.70
 pkgrel=3
 pkgdesc="A complete, easy to use date and time object"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DateTime"
 license=('GPL' 'PerlArtistic')
 depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41'
diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD
index a9ff23703..870fa3e7e 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-dbd-odbc
 pkgver=1.33
 pkgrel=2
 pkgdesc="ODBC Driver for DBI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-ODBC/"
 license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'perl' 'unixodbc')
diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD
index 7af282d37..d2e9c663b 100644
--- a/community/perl-dbd-pg/PKGBUILD
+++ b/community/perl-dbd-pg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-dbd-pg
 pkgver=2.18.1
 pkgrel=1
 pkgdesc="Postgres Driver for DBI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-Pg"
 license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.52' 'postgresql-libs')
diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD
index 314f129d4..35e26ee90 100644
--- a/community/perl-dbd-sqlite2/PKGBUILD
+++ b/community/perl-dbd-sqlite2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-dbd-sqlite2
 pkgver=0.33
 pkgrel=7
 pkgdesc="Perl/CPAN Module DBD::SQLite2"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/DBD-SQLite2"
 license=("GPL" "PerlArtistic")
 depends=("perl-dbi")
diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD
index ecc703202..e6b72e091 100644
--- a/community/perl-dbd-sybase/PKGBUILD
+++ b/community/perl-dbd-sybase/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-dbd-sybase
 pkgver=1.14
 pkgrel=1
 pkgdesc="Sybase Driver for DBI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-Sybase/"
 license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds')
diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD
index 668b79445..896384913 100644
--- a/community/perl-device-serialport/PKGBUILD
+++ b/community/perl-device-serialport/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-device-serialport
 pkgver=1.04
 pkgrel=3
 pkgdesc="POSIX clone of Win32::SerialPort"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Device-SerialPort"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD
index 21a1d84bd..907db9b9f 100644
--- a/community/perl-fuse/PKGBUILD
+++ b/community/perl-fuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-fuse
 pkgver=0.14
 pkgrel=1
 pkgdesc="write filesystems in Perl using FUSE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Fuse"
 depends=('perl' 'fuse')
 license=('GPL')
diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD
index e93bfa0fa..225151d7c 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gd
 pkgver=2.46
 pkgrel=1
 pkgdesc="Interface to Gd Graphics Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GD"
 license=('GPL' 'PerlArtistic')
 depends=('gd')
diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD
index 25e0df822..6dea6c1e1 100644
--- a/community/perl-gnome2-wnck/PKGBUILD
+++ b/community/perl-gnome2-wnck/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gnome2-wnck
 pkgver=0.16
 pkgrel=4
 pkgdesc="Perl interface to the Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("GPL" "Artistic")
 url="http://search.cpan.org/dist/Gnome2-Wnck"
 depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck')
diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD
index 714407586..85dac1dc7 100644
--- a/community/perl-gssapi/PKGBUILD
+++ b/community/perl-gssapi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gssapi
 pkgver=0.28
 pkgrel=4
 pkgdesc="Perl/CPAN Module GSSAPI"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/GSSAPI"
 license=("GPL" "PerlArtistic")
 depends=('krb5')
diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD
index 61a9b62e6..fc1e2f160 100644
--- a/community/perl-gstreamer-interfaces/PKGBUILD
+++ b/community/perl-gstreamer-interfaces/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gstreamer-interfaces
 pkgver=0.06
 pkgrel=3
 pkgdesc="GStreamer::Interfaces"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GStreamer-Interfaces"
 license=('GPL' 'PerlArtistic')
 depends=('glib-perl' 'gstreamer0.10-base' 'perl-extutils-pkgconfig' 'perl-gstreamer' 'perl-extutils-depends')
diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD
index 84f62fa75..4273c6903 100644
--- a/community/perl-gstreamer/PKGBUILD
+++ b/community/perl-gstreamer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gstreamer
 pkgver=0.16
 pkgrel=1
 pkgdesc="Interface to the GStreamer library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GStreamer"
 license=('GPL' 'PerlArtistic')
 depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205')
diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD
index 6b4789bd2..f0f3c21e8 100644
--- a/community/perl-gtk2-sexy/PKGBUILD
+++ b/community/perl-gtk2-sexy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-gtk2-sexy
 pkgver=0.05
 pkgrel=5
 pkgdesc="Perl/CPAN Module Gtk2::Sexy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Gtk2-Sexy"
 license=('GPL' 'PerlArtistic')
 depends=('gtk2' 'libsexy')
diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD
index a4cdb9e76..1ce8a3b11 100644
--- a/community/perl-gtk2-trayicon/PKGBUILD
+++ b/community/perl-gtk2-trayicon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gtk2-trayicon
 pkgver=0.06
 pkgrel=7
 pkgdesc="Perl interface to the EggTrayIcon library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Gtk2-TrayIcon/"
 depends=('gtk2-perl')
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD
index 269e6080a..ebc9e352c 100644
--- a/community/perl-gtk2-webkit/PKGBUILD
+++ b/community/perl-gtk2-webkit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gtk2-webkit
 pkgver=0.09
 pkgrel=1
 pkgdesc="Gtk2::WebKit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Gtk2-WebKit"
 license=('GPL' 'PerlArtistic')
 depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig')
diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD
index 2f93db01f..3177e4998 100644
--- a/community/perl-html-strip/PKGBUILD
+++ b/community/perl-html-strip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-html-strip
 pkgver=1.06
 pkgrel=6
 pkgdesc="Perl/CPAN Module HTML::Strip"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~kilinrax/HTML-Strip/"
 license=("GPL" "PerlArtistic")
 depends=('perl')
diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD
index d9396fc00..af57cf739 100644
--- a/community/perl-inline-java/PKGBUILD
+++ b/community/perl-inline-java/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-inline-java
 pkgver=0.53
 pkgrel=2
 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'perl-inline' 'java-runtime')
 makedepends=('java-environment')
 license=("GPL" "PerlArtistic")
diff --git a/community/perl-io-string/PKGBUILD b/community/perl-io-string/PKGBUILD
index 76d116f9e..f51133495 100644
--- a/community/perl-io-string/PKGBUILD
+++ b/community/perl-io-string/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-io-string
 pkgver=1.08
 pkgrel=7
 pkgdesc="IO::File interface for in-core strings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/IO-String"
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD
index 6560133ec..6afc5da89 100644
--- a/community/perl-io-tty/PKGBUILD
+++ b/community/perl-io-tty/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-io-tty
 pkgver=1.10
 pkgrel=1
 pkgdesc="Provide an interface to TTYs and PTYs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/IO-Tty/"
 license=("GPL" "PerlArtistic")
 depends=('glibc')
diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD
index b1c70feb1..18a78f161 100644
--- a/community/perl-json-xs/PKGBUILD
+++ b/community/perl-json-xs/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 url="http://search.cpan.org/dist/JSON-XS/"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'perl-common-sense')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz)
diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD
index 2cacd77bc..85081460b 100644
--- a/community/perl-libapreq2/PKGBUILD
+++ b/community/perl-libapreq2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-libapreq2
 pkgver=2.13
 pkgrel=1
 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/libapreq2"
 depends=('mod_perl' 'apr-util')
 makedepends=('perl-extutils-xsbuilder')
diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD
index f50e9a06a..fe33de910 100644
--- a/community/perl-linux-pid/PKGBUILD
+++ b/community/perl-linux-pid/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='perl-linux-pid'
 pkgver='0.04'
 pkgrel='1'
 pkgdesc="Interface to Linux getpp?id functions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
 depends=('perl')
diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD
index cf1fc16f4..0b498a844 100644
--- a/community/perl-mail-box-parser-c/PKGBUILD
+++ b/community/perl-mail-box-parser-c/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-mail-box-parser-c
 pkgver=3.006
 pkgrel=6
 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Mail-Box-Parser-C"
 license=("GPL" "PerlArtistic")
 options=('!emptydirs')
diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD
index 15244af54..c9995475f 100644
--- a/community/perl-mail-transport-dbx/PKGBUILD
+++ b/community/perl-mail-transport-dbx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-mail-transport-dbx
 pkgver=0.07
 pkgrel=6
 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Mail-Transport-Dbx"
 license=("GPL" "PerlArtistic")
 options=('!emptydirs')
diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD
index c16439477..b22530497 100644
--- a/community/perl-net-dbus/PKGBUILD
+++ b/community/perl-net-dbus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-net-dbus
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="Binding for DBus messaging protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Net-DBus"
 license=('GPL' 'PerlArtistic')
 depends=('dbus' 'perl-xml-twig')
diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD
index 1d2f41001..313cd913d 100644
--- a/community/perl-net-libidn/PKGBUILD
+++ b/community/perl-net-libidn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-net-libidn
 pkgver=0.12
 pkgrel=4
 pkgdesc="Perl/CPAN Module Net::LibIDN"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Net-LibIDN/"
 license=("GPL" "PerlArtistic")
 depends=(perl libidn)
diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD
index 8d9f1cab4..def2a8d1b 100644
--- a/community/perl-params-validate/PKGBUILD
+++ b/community/perl-params-validate/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-params-validate
 pkgver=1.00
 pkgrel=1
 pkgdesc="Validate sub params against a spec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Params-Validate"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD
index de3d39177..9c3f6ee44 100644
--- a/community/perl-string-crc32/PKGBUILD
+++ b/community/perl-string-crc32/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-string-crc32
 pkgver=1.4
 pkgrel=6
 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/String-CRC32"
 license=("GPL" "PerlArtistic")
 options=('!emptydirs')
diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD
index db2e6d27a..580f8b640 100644
--- a/community/perl-text-charwidth/PKGBUILD
+++ b/community/perl-text-charwidth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-text-charwidth
 pkgver=0.04
 pkgrel=6
 pkgdesc="Perl/CPAN Module Text::CharWidth"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Text-CharWidth"
 license=("GPL" "PerlArtistic")
 options=('!emptydirs')
diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD
index 78b522c7c..21e704403 100644
--- a/community/perl-text-kakasi/PKGBUILD
+++ b/community/perl-text-kakasi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-text-kakasi
 pkgver=2.04
 pkgrel=7
 pkgdesc="Perl frontend to kakasi"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Text-Kakasi"
 license=('GPL' 'PerlArtistic')
 depends=('perl' 'kakasi')
diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD
index 687e000c1..be3eaab4d 100644
--- a/community/perl-tie-hash-indexed/PKGBUILD
+++ b/community/perl-tie-hash-indexed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-tie-hash-indexed
 pkgver=0.05
 pkgrel=6
 pkgdesc="Ordered hashes for Perl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Tie-Hash-Indexed"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD
index 8f9dd8986..3d66d05a7 100644
--- a/community/perl-tk-tablematrix/PKGBUILD
+++ b/community/perl-tk-tablematrix/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-tk-tablematrix
 pkgver=1.23
 pkgrel=7
 pkgdesc="Display data in TableSpreadsheet format"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/Tk-TableMatrix"
 license=("GPL" "PerlArtistic")
 depends=('perl-tk')
diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD
index ba9fcc3f1..66468ec54 100644
--- a/community/perl-www-curl/PKGBUILD
+++ b/community/perl-www-curl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-www-curl
 pkgver=4.15
 pkgrel=1
 pkgdesc="Perl/CPAN Module WWW::Curl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/WWW-Curl/"
 license=("GPL" "PerlArtistic")
 depends=("curl")
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 066d4637b..6680d155e 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=perl-xml-libxml
 pkgver=1.88
 pkgrel=1
 pkgdesc="Interface to the libxml library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/XML-LibXML"
 license=('GPL')
 depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07')
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 4c0b21e74..82e09e9c6 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-xml-libxslt
 pkgver=1.73
 pkgrel=1
 pkgdesc="Interface to the gnome libxslt library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/XML-LibXSLT"
 license=('GPL')
 depends=('perl-xml-libxml' 'libxslt')
diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD
index 053086167..4490b6b3a 100644
--- a/community/perl-xmms/PKGBUILD
+++ b/community/perl-xmms/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-xmms
 pkgver=0.12
 pkgrel=6
 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~dougm/Xmms-Perl/"
 depends=('perl' 'xmms' 'libxxf86dga')
 license=('GPL' 'PerlArtistic')
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index da19dbeef..8293d399f 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pgadmin3
 pkgver=1.14.1
 pkgrel=1
 pkgdesc="A comprehensive design and management interface for PostgreSQL database"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pgadmin.org"
 license=('custom')
 depends=('wxgtk' 'postgresql-libs' 'libxslt')
diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD
index 5291e1d37..37b59a9be 100644
--- a/community/php-geoip/PKGBUILD
+++ b/community/php-geoip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=php-geoip
 pkgver=1.0.8
 pkgrel=1
 pkgdesc="GeoIP module for PHP"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/geoip"
 license=('PHP')
 depends=('php' 'geoip')
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index 050930166..2f206f038 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=php-memcache
 pkgver=3.0.6
 pkgrel=1
 pkgdesc="Memcache module for PHP"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/memcache"
 license=('PHP')
 depends=('php')
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index c66b6ec3f..d6841b2a7 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=php-memcached
 pkgver=1.0.2
 pkgrel=6
 pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/memcached"
 license=('PHP')
 depends=('php' 'libmemcached')
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index a93739555..9feb1be34 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
 optdepends=('libdiscid: CD lookup'
             'chromaprint: fingerprinting')
diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD
index cf9378755..72a3394b2 100644
--- a/community/pidgin-libnotify/PKGBUILD
+++ b/community/pidgin-libnotify/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=pidgin-libnotify
 pkgver=0.14
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="pidgin plugin that enables popups when someone logs in or messages you."
 url="http://gaim-libnotify.sourceforge.net/"
 license=('GPL')
diff --git a/community/pidgin-musictracker/PKGBUILD b/community/pidgin-musictracker/PKGBUILD
index 16300fcf3..058d7b42d 100644
--- a/community/pidgin-musictracker/PKGBUILD
+++ b/community/pidgin-musictracker/PKGBUILD
@@ -12,7 +12,7 @@ url='http://code.google.com/p/pidgin-musictracker'
 license=('GPL2')
 depends=('pidgin' 'gtk2' 'dbus-glib')
 makedepends=('xmms2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
 options=('!libtool')
 md5sums=('8d7225c705484db86b864cab5a536423')
diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD
index 565f57436..2a01f18f7 100644
--- a/community/pidgin-otr/PKGBUILD
+++ b/community/pidgin-otr/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=pidgin-otr
 pkgver=3.2.0
 pkgrel=3
 pkgdesc='Off-the-Record Messaging plugin for Pidgin.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.cypherpunks.ca/otr/'
 depends=('libotr>=3.2.0' 'pidgin' 'perlxml')
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index 745d29a9c..ee664488b 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=pigeonhole
 pkgver=0.2.5
 pkgrel=2
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
 license=('LGPL')
 depends=('dovecot='$_dcpkgver)
diff --git a/community/pinfo/PKGBUILD b/community/pinfo/PKGBUILD
index d5ac06d0e..aa82fe665 100644
--- a/community/pinfo/PKGBUILD
+++ b/community/pinfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pinfo
 pkgver=0.6.10
 pkgrel=2
 pkgdesc="A hypertext info file viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pinfo.alioth.debian.org/"
 license=('GPL')
 depends=('ncurses' 'readline')
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 63c876fb9..1f8b53b9d 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pingus
 pkgver=0.7.6
 pkgrel=1
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48')
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 0e6c7e42e..9b123e6fb 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pinot
 pkgver=0.98
 pkgrel=2
 pkgdesc='Personal search and metasearch tool'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pinot.berlios.de/'
 license=('GPL')
 depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl'
diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD
index 922bb5fa3..5988a08f9 100644
--- a/community/pkgtools/PKGBUILD
+++ b/community/pkgtools/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pkgtools
 pkgver=23
 pkgrel=3
 pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
 license=('GPL')
 source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 6d7585008..02455c007 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=plan9port
 pkgver=20120106
 pkgrel=1
 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://swtch.com/plan9port/"
 license=('custom')
 depends=(xorg-server libxt libxext sh fuse)
diff --git a/community/plib/PKGBUILD b/community/plib/PKGBUILD
index 80374518b..9964fe277 100644
--- a/community/plib/PKGBUILD
+++ b/community/plib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=plib
 pkgver=1.8.5
 pkgrel=2
 pkgdesc="Set of libraries to write games and other realtime interactive applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://plib.sourceforge.net/"
 license=('custom:LGPL')
 makedepends=('mesa' 'libxi' 'libxmu')
diff --git a/community/pmtools/PKGBUILD b/community/pmtools/PKGBUILD
index a8cecf535..8acabff31 100644
--- a/community/pmtools/PKGBUILD
+++ b/community/pmtools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pmtools
 pkgver=20101124
 pkgrel=1
 pkgdesc="A small collection of ACPI power management test and investigation tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://acpi.sourceforge.net/dsdt/index.php"
 license=('GPL2')
 depends=('perl')
diff --git a/community/png2ico/PKGBUILD b/community/png2ico/PKGBUILD
index 8a5f7a330..a0f3fdabc 100644
--- a/community/png2ico/PKGBUILD
+++ b/community/png2ico/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=png2ico
 pkgver=20021208
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Converts PNG files to Windows icon resource files"
 url="http://www.winterdrache.de/freeware/png2ico/"
 license=("GPL2")
diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD
index f154e016f..efb32fa9c 100644
--- a/community/podofo/PKGBUILD
+++ b/community/podofo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=podofo
 pkgver=0.9.1
 pkgrel=2
 pkgdesc="A C++ library to work with the PDF file format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://podofo.sourceforge.net"
 license=('GPL')
 depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index f8b2e2c39..c4142b89f 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=poedit
 pkgver=1.4.6.1
 pkgrel=6
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.poedit.net/"
 license=('custom')
 depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext')
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 7e1d7006d..f1a9d2baf 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -8,7 +8,7 @@ _realname=PokerTH
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="Poker game written in C++/QT4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
 license=('GPL' 'custom')
 depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index d09f48478..20d910287 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=polipo
 pkgver=1.0.4.1
 pkgrel=1
 pkgdesc="A small and fast caching web proxy."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pps.jussieu.fr/~jch/software/polipo/"
 license=('GPL')
 depends=('glibc' 'bash')
diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD
index 53946b6e1..91e4b4fcf 100644
--- a/community/pork/PKGBUILD
+++ b/community/pork/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pork
 pkgver=0.99.8.1
 pkgrel=4
 pkgdesc="Console-based AOL Instant Messenger & IRC client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('ncurses' 'perl')
diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD
index 1872b9457..767c8784b 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=portaudio
 pkgver=19_20110326
 pkgrel=1
 pkgdesc="A free, cross-platform, open source, audio I/O library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.portaudio.com/"
 license=('custom')
 depends=('jack')
diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD
index 58b782570..00ed1b3ac 100644
--- a/community/portaudio_cpp/PKGBUILD
+++ b/community/portaudio_cpp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=portaudio_cpp
 pkgver=19_20110326
 pkgrel=1
 pkgdesc="PortAudio c++ bindings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.portaudio.com/"
 license=('custom')
 depends=("portaudio=${pkgver}" 'gcc-libs')
diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD
index a513305dc..033f881a6 100644
--- a/community/portmidi/PKGBUILD
+++ b/community/portmidi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=portmidi
 pkgver=217
 pkgrel=3
 pkgdesc="Platform independent library for real-time MIDI input/output."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://portmedia.sourceforge.net/'
 license=('GPL')
 depends=('alsa-lib')
diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD
index e04bd4d30..379774e3e 100644
--- a/community/postgis/PKGBUILD
+++ b/community/postgis/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=postgis
 pkgver=1.5.3
 pkgrel=2
 pkgdesc="Adds support for geographic objects to PostgreSQL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://postgis.refractions.net/"
 license=('GPL')
 depends=('postgresql' 'proj' 'geos')
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index 02d82fec0..98d2af3dc 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pound
 pkgver=2.5
 pkgrel=2
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.apsis.ch/pound/index_html"
 license=('GPL')
 depends=('pcre' 'openssl')
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 83f906f85..8a00e25f6 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=powertop
 pkgver=1.13
 pkgrel=2
 pkgdesc="Tool that finds the software that makes your laptop use more power than necessary"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesswatts.org/projects/powertop/"
 license=('GPL2')
 depends=('ncurses')
diff --git a/community/pppd-ldap-simple/PKGBUILD b/community/pppd-ldap-simple/PKGBUILD
index 9511d9b2d..13c0986a2 100644
--- a/community/pppd-ldap-simple/PKGBUILD
+++ b/community/pppd-ldap-simple/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pppd-ldap-simple
 pkgver=0.12b
 pkgrel=5
 pkgdesc="pppd ldap simple plugin (based on pppd ldap, without radius, etc. Just search by uid and userPassword)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/pppd-ldap/"
 license=('GPL')
 source=(http://archlinux-stuff.googlecode.com/files/pppd_ldap-simple-$pkgver.tar.gz)
diff --git a/community/pppd-ldap/PKGBUILD b/community/pppd-ldap/PKGBUILD
index 86e7ebea7..9fe5aaed2 100644
--- a/community/pppd-ldap/PKGBUILD
+++ b/community/pppd-ldap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pppd-ldap
 pkgver=0.12b
 pkgrel=3
 pkgdesc="A plugin for PPPD which performs an LDAP-enabled version of pppd"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/pppd-ldap/"
 license=('GPL')
 depends=('ppp' 'libldap')
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index d9427632f..d97a6d95d 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pptpd
 pkgver=1.3.4
 pkgrel=4
 pkgdesc="Poptop server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://poptop.sourceforge.net/"
 license=('GPL')
 depends=(ppp glibc)
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index b06b030e6..568cd38c4 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pragha
 pkgver=0.99.1.1
 pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pragha.wikispaces.com/"
 license=('GPL3')
 depends=('libnotify' 'libcdio' 'curl' 
diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD
index f33cec1fe..94106432e 100644
--- a/community/prboom/PKGBUILD
+++ b/community/prboom/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=5
 pkgdesc='A game engine which provides a program to play Doom levels.'
 url='http://prboom.sourceforge.net/'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net')
 source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
         'libpng-1.4.patch')
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index 34a04f8c1..4b677caf1 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=prelink
 pkgver=20111012
 pkgrel=1
 pkgdesc='ELF prelinking utility to speed up dynamic linking.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD
index f3c9a1c18..847ec0cc1 100644
--- a/community/preload/PKGBUILD
+++ b/community/preload/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=preload
 pkgver=0.6.4
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Makes applications run faster by prefetching binaries and shared objects"
 url="http://sourceforge.net/projects/preload"
 license=('GPL2')
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index 8fdd42121..97626639c 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=privoxy
 pkgver=3.0.19
 pkgrel=1
 pkgdesc='A web proxy with advanced filtering capabilities.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.privoxy.org'
 license=('GPL')
 depends=('pcre' 'zlib')
diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD
index 7304696ff..0123c6a68 100644
--- a/community/procstatd/PKGBUILD
+++ b/community/procstatd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=procstatd
 pkgver=1.4.2
 pkgrel=5
 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc"
-arch=('i686 x86_64')
+arch=('i686 x86_64' 'mips64el')
 license=('GPL')
 source=(http://downloads.sourceforge.net/herdtools/$pkgname.tar.gz)
 md5sums=('1fdeaf05ca6337f5c02e76a76c53c407')
diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD
index 353b54ad5..cb0fbd6b5 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=proj
 pkgver=4.7.0
 pkgrel=1
 pkgdesc="Cartographic Projections library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/proj/"
 license=('MIT')
 options=('!libtool')
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index 84d40eeb8..68b20f4b9 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=projectm
 pkgver=2.0.1
 pkgrel=3
 pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
 depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext')
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 6b49b122c..0d6a57414 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=prosody
 pkgver=0.8.2
 pkgrel=1
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
 license=('MIT')
 depends=('lua>=5.1' 'luasocket' 'luaexpat' 'luafilesystem' 'libidn>=0.5.18' 'openssl')
diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD
index 8a5c3b2df..739463982 100644
--- a/community/protobuf/PKGBUILD
+++ b/community/protobuf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('protobuf' 'protobuf-python')
 pkgver=2.4.1
 pkgrel=1
 pkgdesc="A way of encoding structured data in an efficient yet extensible format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/protobuf/"
 license=('APACHE')
 depends=('gcc-libs' 'zlib')
diff --git a/community/proxytunnel/PKGBUILD b/community/proxytunnel/PKGBUILD
index 078540f3f..8ae8cc023 100644
--- a/community/proxytunnel/PKGBUILD
+++ b/community/proxytunnel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=proxytunnel
 pkgver=1.9.0
 pkgrel=2
 pkgdesc="a program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://proxytunnel.sourceforge.net"
 license=('GPL')
 depends=('openssl')
diff --git a/community/psimedia/PKGBUILD b/community/psimedia/PKGBUILD
index e2a1f5cf1..baff02667 100644
--- a/community/psimedia/PKGBUILD
+++ b/community/psimedia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=psimedia
 pkgver=1.0.3
 pkgrel=7
 pkgdesc="Voice and video chat plugin for Psi-like IM clients.  The implementation is based on GStreamer."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://delta.affinix.com/psimedia/"
 depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins'
diff --git a/community/pspshrink/PKGBUILD b/community/pspshrink/PKGBUILD
index 9b6ba9540..1944a5af0 100644
--- a/community/pspshrink/PKGBUILD
+++ b/community/pspshrink/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pspshrink
 pkgver=1.1.2
 pkgrel=2
 pkgdesc="PSP Shrink allows you to shrink your isos to the cso format."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pspshrink/"
 license=('GPL2')
 makedepends=(gtkmm)
diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD
index 70b493bd0..acce6d1be 100644
--- a/community/psqlodbc/PKGBUILD
+++ b/community/psqlodbc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=psqlodbc
 pkgver=09.00.0310
 pkgrel=2
 pkgdesc="PostgreSQL ODBC driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.postgresql.org"
 depends=('unixodbc' 'postgresql-libs')
diff --git a/community/pstreams/PKGBUILD b/community/pstreams/PKGBUILD
index 62b446587..a27c1066b 100644
--- a/community/pstreams/PKGBUILD
+++ b/community/pstreams/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pstreams
 pkgver=0.7.0
 pkgrel=1
 pkgdesc='C++ utility for simple IOStream-based Inter-Process Communication.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pstreams.sourceforge.net'
 license=('LGPL')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index 63ec27273..fa9d3d803 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=puzzles
 pkgver=9306
 pkgrel=2
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 license=('MIT')
 makedepends=('pkgconfig')
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 7f4651a3b..5d09b1152 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pv
 pkgver=1.2.0
 pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
diff --git a/community/pwmanager/PKGBUILD b/community/pwmanager/PKGBUILD
index c13ce266a..e0bafdeb5 100644
--- a/community/pwmanager/PKGBUILD
+++ b/community/pwmanager/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pwmanager
 pkgver=1.2.4
 pkgrel=5
 pkgdesc="With PwManager you can easily manage your passwords"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://passwordmanager.sourceforge.net/"
 license=('GPL')
 depends=('kdelibs3')
diff --git a/community/pwsafe/PKGBUILD b/community/pwsafe/PKGBUILD
index 736790f61..ee1fb1011 100644
--- a/community/pwsafe/PKGBUILD
+++ b/community/pwsafe/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pwsafe
 pkgver=0.2.0
 pkgrel=6
 pkgdesc="A commandline program for managing encrypted password databases"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nsd.dyndns.org/pwsafe/"
 license=('GPL')
 depends=('openssl' 'libxmu' 'readline')
diff --git a/community/pyglet/PKGBUILD b/community/pyglet/PKGBUILD
index 2f795c66d..b037dc146 100644
--- a/community/pyglet/PKGBUILD
+++ b/community/pyglet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pyglet
 pkgver=1.1.4
 pkgrel=2
 pkgdesc="A cross-platform windowing and multimedia library for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pyglet.org/"
 license=('BSD')
 depends=('python2')
diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD
index 3f5affbc8..fdecee5ae 100644
--- a/community/pygoocanvas/PKGBUILD
+++ b/community/pygoocanvas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pygoocanvas
 pkgver=0.14.1
 pkgrel=4
 pkgdesc="GooCanvas python bindings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.berlios.de/projects/pygoocanvas"
 license=('LGPL')
 depends=('python2' 'goocanvas1' 'pygtk')
diff --git a/community/pyid3lib/PKGBUILD b/community/pyid3lib/PKGBUILD
index 21ddae1a1..40f1cc6b0 100644
--- a/community/pyid3lib/PKGBUILD
+++ b/community/pyid3lib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pyid3lib
 pkgver=0.5.1
 pkgrel=6
 pkgdesc="A Python module for editing ID3v2 tags of MP3 audio files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pyid3lib.sourceforge.net/"
 license=('LGPL')
 depends=('python2' 'glibc' 'id3lib')
diff --git a/community/pylibacl/PKGBUILD b/community/pylibacl/PKGBUILD
index f43670048..4d5cee098 100644
--- a/community/pylibacl/PKGBUILD
+++ b/community/pylibacl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pylibacl
 pkgver=0.5.0
 pkgrel=2
 pkgdesc='A python extension module that allows you to manipulate the POSIX.1e ACLs.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pylibacl.sourceforge.net/'
 license=('GPL')
 depends=('python2')
diff --git a/community/pylorcon/PKGBUILD b/community/pylorcon/PKGBUILD
index 6502fdbd4..55866fb71 100644
--- a/community/pylorcon/PKGBUILD
+++ b/community/pylorcon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pylorcon
 pkgver=3
 pkgrel=4
 pkgdesc="Python wrapper for the C LORCON (Loss Of Radio CONnectivity) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pylorcon/"
 license=('GPLv2')
 depends=('python2' 'lorcon-old-svn')
diff --git a/community/pympd/PKGBUILD b/community/pympd/PKGBUILD
index 742a74a63..befa59d9c 100644
--- a/community/pympd/PKGBUILD
+++ b/community/pympd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pympd
 pkgver=0.08.1
 pkgrel=2
 pkgdesc="A Rhythmbox-like PyGTK+ client for Music Player Daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pympd.sourceforge.net/"
 license=('GPL')
 depends=('libglade' 'pygtk>=2.6')
diff --git a/community/pyogg/PKGBUILD b/community/pyogg/PKGBUILD
index 73c0217df..5122b3673 100644
--- a/community/pyogg/PKGBUILD
+++ b/community/pyogg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pyogg
 pkgver=1.3
 pkgrel=6
 pkgdesc="Python ogg wrapper library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ekyo.nerim.net/software/pyogg/index.html"
 license=('LGPL2')
 depends=('python2' 'libogg' 'glibc')
diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD
index 82d608970..49f1839a7 100644
--- a/community/pypanel/PKGBUILD
+++ b/community/pypanel/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pypanel
 pkgver=2.4
 pkgrel=7
 pkgdesc='A lightweight panel/taskbar for X11 window managers written in python.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pypanel.sourceforge.net/'
 license=('GPL')
 depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft')
diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD
index 862ea062e..c48714ab8 100644
--- a/community/pyqt3/PKGBUILD
+++ b/community/pyqt3/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pyqt3
 pkgver=3.18.1
 pkgrel=9
 pkgdesc="A set of Python bindings for the Qt3 toolkit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/pyqt/intro"
 depends=('python2-sip' 'qscintilla-qt3')
 license=('GPL')
diff --git a/community/pysol-sound-server/PKGBUILD b/community/pysol-sound-server/PKGBUILD
index b3f7c814c..254e01b88 100644
--- a/community/pysol-sound-server/PKGBUILD
+++ b/community/pysol-sound-server/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pysol-sound-server
 pkgver=3.01
 pkgrel=7
 pkgdesc="A Python extension module that plays WAV samples together with MP3 or MOD background music"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pysol.org/"
 license=('GPL' 'LGPL')
 depends=('python2' 'smpeg')
diff --git a/community/pystatgrab/PKGBUILD b/community/pystatgrab/PKGBUILD
index 5ea3fbbde..c6698eaed 100644
--- a/community/pystatgrab/PKGBUILD
+++ b/community/pystatgrab/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pystatgrab
 pkgver=0.5
 pkgrel=4
 pkgdesc="Python bindings for libstatgrab"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.i-scream.org/pystatgrab"
 license=('GPL')
 depends=('python2' 'libstatgrab')
diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD
index 79210ea23..9dba97992 100644
--- a/community/python-bsddb/PKGBUILD
+++ b/community/python-bsddb/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=5.2.0
 pkgrel=3
 pkgdesc="Python interface for BerkeleyDB"
 license=('MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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
diff --git a/community/python-cjson/PKGBUILD b/community/python-cjson/PKGBUILD
index 5f864b10b..0979021c3 100644
--- a/community/python-cjson/PKGBUILD
+++ b/community/python-cjson/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=python-cjson
 pkgver=1.0.5
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 pkgdesc="Fast JSON encoder/decoder for Python"
 url="http://pypi.python.org/pypi/python-cjson/"
diff --git a/community/python-fuse/PKGBUILD b/community/python-fuse/PKGBUILD
index 1ebf70af6..bd0043b2d 100644
--- a/community/python-fuse/PKGBUILD
+++ b/community/python-fuse/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=python-fuse
 pkgver=0.2.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Python bindings for FUSE"
 url="http://fuse.sourceforge.net/wiki/index.php/FusePython"
 license=('LGPL')
diff --git a/community/python-galago-gtk/PKGBUILD b/community/python-galago-gtk/PKGBUILD
index 1589d3e41..66fdff795 100644
--- a/community/python-galago-gtk/PKGBUILD
+++ b/community/python-galago-gtk/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=python-galago-gtk
 pkgver=0.5.0
 pkgrel=5
 pkgdesc="A library of simple functions that are optimized for various CPUs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://galago-project.org"
 options=('!libtool')
 license=('LGPL')
diff --git a/community/python-galago/PKGBUILD b/community/python-galago/PKGBUILD
index b6fcaa5b9..d2e1e07ab 100644
--- a/community/python-galago/PKGBUILD
+++ b/community/python-galago/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-galago
 pkgver=0.5.0
 pkgrel=4
 pkgdesc="A library of simple functions that are optimized for various CPUs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://galago-project.org"
 options=('!libtool')
 license=('LGPL')
diff --git a/community/python-gnupginterface/PKGBUILD b/community/python-gnupginterface/PKGBUILD
index c484684b7..f4710d43c 100644
--- a/community/python-gnupginterface/PKGBUILD
+++ b/community/python-gnupginterface/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=python-gnupginterface
 pkgver=0.3.2
 pkgrel=5
 pkgdesc="A Python interface to GNU Privacy Guard (GnuPG)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://py-gnupg.sourceforge.net/"
 license=('GPL')
 depends=('gnupg' 'python2')
diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD
index 992a476ef..2542cf2dc 100644
--- a/community/python-gnutls/PKGBUILD
+++ b/community/python-gnutls/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python-gnutls
 pkgver=1.2.2
 pkgrel=1
 pkgdesc="Python wrapper for the GNUTLS library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cheeseshop.python.org/pypi/python-gnutls"
 depends=('python2' 'gnutls')
 license=('LGPL')
diff --git a/community/python-html5lib/PKGBUILD b/community/python-html5lib/PKGBUILD
index bcd2f73b6..4150fbf02 100644
--- a/community/python-html5lib/PKGBUILD
+++ b/community/python-html5lib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python-html5lib
 pkgver=0.90
 pkgrel=1
 pkgdesc="A HTML parser/tokenizer based on the WHATWG HTML5 spec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/html5lib/"
 license=('MIT')
 depends=('python2')
diff --git a/community/python-lcms/PKGBUILD b/community/python-lcms/PKGBUILD
index 5e2d6a263..e5cd1d251 100644
--- a/community/python-lcms/PKGBUILD
+++ b/community/python-lcms/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.19
 _mver=1.19
 pkgrel=2
 pkgdesc="LittleCMS Python bindings"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('CUSTOM')
 depends=('libtiff' 'python2' 'lcms')
 url="http://www.littlecms.com"
diff --git a/community/python-memcached/PKGBUILD b/community/python-memcached/PKGBUILD
index f9d01cbfe..f90b83dae 100644
--- a/community/python-memcached/PKGBUILD
+++ b/community/python-memcached/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.48
 pkgrel=1
 pkgdesc="A Python interface to memcached"
 url="ftp://ftp.tummy.com/pub/python-memcached/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('Python')
 source=(ftp://ftp.tummy.com/pub/$pkgname/$pkgname-$pkgver.tar.gz LICENSE)
 makedepends=('setuptools')
diff --git a/community/python-mpi4py/PKGBUILD b/community/python-mpi4py/PKGBUILD
index 83574c743..454a96961 100644
--- a/community/python-mpi4py/PKGBUILD
+++ b/community/python-mpi4py/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=python-mpi4py
 pkgname=('python-mpi4py' 'python2-mpi4py')
 pkgver=1.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mpi4py.scipy.org"
 license=('BSD')
 makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi')
diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD
index 02d098a71..30a7cd923 100644
--- a/community/python-numarray/PKGBUILD
+++ b/community/python-numarray/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-numarray
 pkgver=1.5.2
 pkgrel=5
 pkgdesc='Provides array manipulation and computational capabilities.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://numpy.scipy.org/'
 license=('BSD')
 depends=('python2')
diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD
index 9b17297d7..7f86ce232 100644
--- a/community/python-openbabel/PKGBUILD
+++ b/community/python-openbabel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-openbabel
 pkgver=2.3.1
 pkgrel=1
 pkgdesc="Python bindings of openbabel library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openbabel.org/wiki/Python"
 license=('GPL')
 depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen')
diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD
index 99cafbacb..54244d526 100755
--- a/community/python-psycopg1/PKGBUILD
+++ b/community/python-psycopg1/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python-psycopg1
 pkgver=1.1.21
 pkgrel=5
 pkgdesc="A PostgreSQL database adapter for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://initd.org/projects/psycopg1"
 license=('GPL')
 depends=('python-egenix-mx-base' 'postgresql')
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index 18b83b67c..a081a49b5 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('python-psycopg2' 'python2-psycopg2')
 pkgver=2.4.4
 pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
diff --git a/community/python-pybluez/PKGBUILD b/community/python-pybluez/PKGBUILD
index cb02defe0..df7d0dcb7 100644
--- a/community/python-pybluez/PKGBUILD
+++ b/community/python-pybluez/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-pybluez
 pkgver=0.18
 pkgrel=2
 pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pybluez/"
 license=('GPL')
 provides=('pybluez')
diff --git a/community/python-pychm/PKGBUILD b/community/python-pychm/PKGBUILD
index 77b8f05b8..dd203c1e6 100644
--- a/community/python-pychm/PKGBUILD
+++ b/community/python-pychm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python-pychm
 pkgver=0.8.4
 pkgrel=5
 pkgdesc="Python bindings for CHMLIB"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnochm.sourceforge.net"
 license=('GPL')
 depends=('chmlib' 'python2')
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 98d193a89..25bdc0312 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python-pymongo
 pkgver=1.9b1
 pkgrel=3
 pkgdesc="Python driver for MongoDB"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=("APACHE")
 url="http://pypi.python.org/pypi/pymongo3/"
 depends=('python')
diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD
index 73e71f73c..72d738f24 100755
--- a/community/python-pyro/PKGBUILD
+++ b/community/python-pyro/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=4.9
 pkgrel=1
 pkgdesc="Python Remote Objects"
 url="http://irmen.home.xs4all.nl/pyro/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('python' 'python2')
 source=(http://pypi.python.org/packages/source/P/Pyro4/Pyro4-${pkgver}.tar.gz)
diff --git a/community/python-pysqlite-legacy/PKGBUILD b/community/python-pysqlite-legacy/PKGBUILD
index c87ce7793..766c0a1c7 100644
--- a/community/python-pysqlite-legacy/PKGBUILD
+++ b/community/python-pysqlite-legacy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-pysqlite-legacy
 pkgver=1.0.1
 pkgrel=7
 pkgdesc="A Python DB-API 2.0 interface for the legacy SQLite 2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://initd.org/tracker/pysqlite"
 license=('custom')
 depends=('python2' 'sqlite2')
diff --git a/community/python-pyxmpp/PKGBUILD b/community/python-pyxmpp/PKGBUILD
index 97c1d1b37..bc07b6259 100644
--- a/community/python-pyxmpp/PKGBUILD
+++ b/community/python-pyxmpp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-pyxmpp
 pkgver=1.1.2
 pkgrel=1
 pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pyxmpp.jajcus.net/"
 license=('LGPL')
 depends=('python-dnspython' 'libxml2' 'python-m2crypto')
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index 9b7280d04..d9ac969d6 100755
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('python-scipy' 'python2-scipy')
 pkgver=0.10.0
 pkgrel=1
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scipy.org/"
 license=('BSD')
 makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
diff --git a/community/python-vorbissimple/PKGBUILD b/community/python-vorbissimple/PKGBUILD
index 643cebbe6..ed4ae8b8d 100644
--- a/community/python-vorbissimple/PKGBUILD
+++ b/community/python-vorbissimple/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-vorbissimple
 pkgver=0.0.2
 pkgrel=4
 pkgdesc="Python bindings for vorbissimple"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kamaelia.sourceforge.net"
 license=('MPL')
 depends=('python2' 'vorbissimple')
diff --git a/community/python-yaml/PKGBUILD b/community/python-yaml/PKGBUILD
index 2fe0f3d42..fb2af475a 100644
--- a/community/python-yaml/PKGBUILD
+++ b/community/python-yaml/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(python2-yaml python-yaml)
 pkgver=3.10
 pkgrel=1
 pkgdesc="Python bindings for YAML, using fast libYAML library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pyyaml.org"
 license=('MIT')
 makedepends=('python' 'python2' 'libyaml')
diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD
index bb82fc98c..87f49c01d 100644
--- a/community/python2-basemap/PKGBUILD
+++ b/community/python2-basemap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-basemap
 pkgver=1.0.2
 pkgrel=1
 pkgdesc="Toolkit for plotting data on map projections"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://matplotlib.sourceforge.net/basemap/doc/html/"
 license=('custom')
 depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') 
diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD
index 10fedb303..360825993 100644
--- a/community/python2-ldap/PKGBUILD
+++ b/community/python2-ldap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-ldap
 pkgver=2.4.4
 pkgrel=1
 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://python-ldap.sourceforge.net"
 license=('custom')
 depends=('python2' 'libldap>=2.4.26')
diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD
index 102421f30..45a512959 100644
--- a/community/python2-matplotlib/PKGBUILD
+++ b/community/python2-matplotlib/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=python2-matplotlib
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/python2-openbabel/PKGBUILD b/community/python2-openbabel/PKGBUILD
index d7376972f..6ca534313 100644
--- a/community/python2-openbabel/PKGBUILD
+++ b/community/python2-openbabel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-openbabel
 pkgver=2.3.1
 pkgrel=1
 pkgdesc="Python 2 bindings of openbabel library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openbabel.org/wiki/Python"
 license=('GPL')
 depends=('python2' 'gcc-libs' "openbabel=${pkgver}" 'eigen')
diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD
index 45587a5d9..5a7e907d7 100644
--- a/community/python2-poppler/PKGBUILD
+++ b/community/python2-poppler/PKGBUILD
@@ -7,7 +7,7 @@ _realname=pypoppler
 pkgver=0.12.1
 pkgrel=7
 pkgdesc="Python 2.x bindings for Poppler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/poppler-python"
 license=('GPL')
 depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2')
diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD
index 87473ca88..22e894a3b 100644
--- a/community/python2-pymongo/PKGBUILD
+++ b/community/python2-pymongo/PKGBUILD
@@ -11,7 +11,7 @@ url="http://pypi.python.org/pypi/pymongo/"
 depends=('python2')
 makedepends=('python2-distribute')
 source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz)
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 md5sums=('40f8c8be0edcea398ba41d5d3ba5e8b0')
 
 package() {
diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD
index 0e5477a4a..bc8e85fcf 100644
--- a/community/python2-pyopencl/PKGBUILD
+++ b/community/python2-pyopencl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python2-pyopencl
 pkgver=2011.1.2
 pkgrel=4
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mathema.tician.de/software/pyopencl"
 license=('custom')
 depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa')
diff --git a/community/pyvorbis/PKGBUILD b/community/pyvorbis/PKGBUILD
index 83ce3a8eb..f2a83d7b8 100644
--- a/community/pyvorbis/PKGBUILD
+++ b/community/pyvorbis/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.4
 pkgrel=5
 pkgdesc="Python vorbis wrapper library"
 url="http://www.andrewchatham.com/pyogg/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('python2' 'libvorbis' 'pyogg>=1.3-3')
 source=(http://ekyo.nerim.net/software/pyogg/${pkgname}-${pkgver}.tar.gz
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 58b64cd6c..73858f5e8 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qbittorrent
 pkgver=2.9.3
 pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qbittorrent.org/"
 license=('GPL')
 depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 50853b837..074cad7a5 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qcad
 pkgver=2.0.5.0
 pkgrel=8
 pkgdesc="A 2D CAD package based upon Qt"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ribbonsoft.com/qcad.html"
 license=('GPL2')
 depends=('qt3')
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index 696f3c03b..73af75518 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.3
 pkgrel=3
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url="http://digilander.libero.it/mcostalba/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('qt' 'git')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD
index 595c07c70..6bf66405d 100644
--- a/community/qgo/PKGBUILD
+++ b/community/qgo/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.5.4
 _realver=1.5.4-r3
 pkgrel=4
 pkgdesc="A Go client and full featured SGF editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qgo.sourceforge.net/"
 license=('GPL')
 depends=('qt3' 'libsm')
diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD
index 24be5d84b..18fc8acdc 100644
--- a/community/qingy/PKGBUILD
+++ b/community/qingy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qingy
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="A DirectFB getty replacement"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qingy.sourceforge.net/"
 license=('GPL')
 depends=('directfb' 'pam' 'openssl' 'ncurses' 'libxss')
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index 0f783cec4..d88dfb571 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qlandkartegt
 pkgver=1.3.1
 pkgrel=2
 pkgdesc="Use your GPS with Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qlandkarte.org/"
 license=('GPL')
 depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs'
diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD
index 0ecf20c74..23c255127 100644
--- a/community/qmc2/PKGBUILD
+++ b/community/qmc2/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME"
 url="http://qmc2.arcadehits.net"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qtwebkit' 'phonon' 'sdl')
 makedepends=('rsync' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 6e5964a32..e594e316c 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qmmp
 pkgver=0.5.2
 pkgrel=3
 pkgdesc="Qt4 based audio-player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qmmp.ylsoftware.com/"
 license=('GPL')
 depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD
index 42a0bf0fc..b98775d66 100644
--- a/community/qmpdclient/PKGBUILD
+++ b/community/qmpdclient/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qmpdclient
 pkgver=1.2.2
 pkgrel=2
 pkgdesc="A Qt4 client for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bitcheese.net/wiki/QMPDClient"
 license=('GPL')
 depends=('qt')
diff --git a/community/qoauth/PKGBUILD b/community/qoauth/PKGBUILD
index ea7a724ec..7721aecb9 100644
--- a/community/qoauth/PKGBUILD
+++ b/community/qoauth/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Support with OAuth-powered network services"
 url="http://github.com/ayoy/qoauth"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qca')
 makedepends=('cmake' 'automoc4')
 source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-src.tar.bz2")
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index a48057f65..d1ec3d9b7 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
 depends=('qt')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license="GPL"
 source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2)
 md5sums=('dc3396749ad9254fd60ca84b5c0b16b9')
diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD
index 9d8987cb2..03bacd40e 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qpxtool
 pkgver=0.7.1_002
 pkgrel=1
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qpxtool.sourceforge.net/"
 license=('GPL')
 depends=('qt')
diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD
index 97da30f58..8de84ddb2 100644
--- a/community/qscintilla-qt3/PKGBUILD
+++ b/community/qscintilla-qt3/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qscintilla-qt3
 pkgver=1.7.1
 pkgrel=4
 pkgdesc="A port to Qt3 of Neil Hodgson's Scintilla C++ editor class"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/"
 license=('GPL2')
 depends=('qt3')
diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD
index 8bcd24b0f..ad3c84abb 100755
--- a/community/qstardict/PKGBUILD
+++ b/community/qstardict/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qstardict
 pkgver=1.0
 pkgrel=1
 pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qstardict.ylsoftware.com/index.php"
 license=('GPL2')
 depends=('qt')
diff --git a/community/qsvn/PKGBUILD b/community/qsvn/PKGBUILD
index ebb582bce..9516cd232 100644
--- a/community/qsvn/PKGBUILD
+++ b/community/qsvn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qsvn
 pkgver=0.8.3
 pkgrel=2
 pkgdesc="Qt4 GUI for Subversion."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.anrichter.net/projects/qsvn/"
 license=('GPL')
 depends=('qt' 'subversion' 'db>=4.7')
diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD
index 06eeecf79..2ccb70408 100644
--- a/community/qt-recordmydesktop/PKGBUILD
+++ b/community/qt-recordmydesktop/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qt-recordmydesktop
 pkgver=0.3.8
 pkgrel=4
 pkgdesc="Qt4 frontend for recordMyDesktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://recordmydesktop.sourceforge.net"
 license=('GPL')
 depends=('recordmydesktop>=0.3.8.1' 'python2-qt')
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index fb21f0f79..91413e68d 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -11,7 +11,7 @@ pkgver=2.4.0
 _pkgver=2.4.0
 pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/products/developer-tools'
 license=('LGPL')
 depends=('qt>=4.8.0')
diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD
index 2a0ada7e2..2fe9aeaf4 100644
--- a/community/qtemu/PKGBUILD
+++ b/community/qtemu/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="Graphical user interface for QEMU written in Qt4"
 url="http://qtemu.org"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('cmake')
 depends=('qemu' 'qt>=4.1')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD
index 922fc22fe..1f69c5cb9 100644
--- a/community/qtfm/PKGBUILD
+++ b/community/qtfm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qtfm
 pkgver=5.3
 pkgrel=1
 pkgdesc="A lightweight file manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qtfm.org/"
 license=('GPL')
 depends=('qt')
diff --git a/community/qtmpc/PKGBUILD b/community/qtmpc/PKGBUILD
index 95900ba1a..cd6d10d9a 100644
--- a/community/qtmpc/PKGBUILD
+++ b/community/qtmpc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qtmpc
 pkgver=0.6.1
 pkgrel=2
 pkgdesc="Qt4-based front-end for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qtmpc.lowblog.nl/"
 license=('GPL')
 depends=('hicolor-icon-theme' 'kdebase-runtime' 'qt')
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index d71dbdbe0..210a87f2b 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qtractor
 pkgver=0.5.3
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qtractor.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'jack' 'slv2' 'libmad' 'liblo'
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 80a3d47f2..9c87260ae 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=quassel
 pkgver=0.7.3
 pkgrel=1
 pkgdesc="QT4 irc client with a separated core"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://quassel-irc.org/"
 license=('GPL')
 depends=('kdelibs' 'oxygen-icons' 'hicolor-icon-theme')
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index 0f049b051..411fc3b37 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qucs
 pkgver=0.0.16
 pkgrel=1
 pkgdesc="An integrated circuit simulator with a graphical user interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qucs.sourceforge.net"
 license=('GPL')
 depends=('qt3')
diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD
index 8e12b892d..ec287ab3b 100644
--- a/community/quesoglc/PKGBUILD
+++ b/community/quesoglc/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=quesoglc
 pkgver=0.7.2
 pkgrel=1
 pkgdesc='The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API).'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://quesoglc.sourceforge.net/'
 license=('GPL')
 depends=('freetype2' 'fontconfig' 'freeglut' 'fribidi' 'mesa')
diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD
index 637179fe1..cd0e6c5dd 100644
--- a/community/quilt/PKGBUILD
+++ b/community/quilt/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=quilt
 pkgver=0.50
 pkgrel=1
 pkgdesc='Manage a series of patches by keeping track of the changes each patch makes'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://savannah.nongnu.org/projects/quilt'
 license=('GPL2')
 depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext')
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index ea737ac4b..5f2bedaa8 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=quvi
 pkgver=0.4.1
 pkgrel=1
 pkgdesc='Command-line tool for parsing video download links.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
 license=('LGPL')
 depends=('libquvi')
diff --git a/community/radeontool/PKGBUILD b/community/radeontool/PKGBUILD
index 7092a9d77..7d6eedb67 100644
--- a/community/radeontool/PKGBUILD
+++ b/community/radeontool/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.6.2
 pkgrel=1
 pkgdesc="Radeontool (and avivotool) are lowlevel tools to tweak register and dump state on radeon GPUs"
 url="http://airlied.livejournal.com/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('ZLIB')
 source=(http://people.freedesktop.org/~airlied/radeontool/${pkgname}-${pkgver}.tar.gz
 	license.txt)
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index d42e9b931..29a200129 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
 depends=('glibc')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 install=radvd.install
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d')
 md5sums=('ac8a862d2b232d25ea2622274a2da8a4'
diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD
index b592275ff..1dc174d75 100644
--- a/community/rapidsvn/PKGBUILD
+++ b/community/rapidsvn/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.12.0
 pkgrel=5
 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework."
 url='http://rapidsvn.tigris.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 options=('!libtool')
 depends=('subversion' 'wxgtk')
diff --git a/community/raul/PKGBUILD b/community/raul/PKGBUILD
index 92f6d497b..ff583458c 100644
--- a/community/raul/PKGBUILD
+++ b/community/raul/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=raul
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="C++ Realtime Audio Utility Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://drobilla.net/software/raul/"
 depends=('glib2')
 makedepends=('boost' 'python2')
diff --git a/community/raw-thumbnailer/PKGBUILD b/community/raw-thumbnailer/PKGBUILD
index 09aba9d1b..275a110ee 100644
--- a/community/raw-thumbnailer/PKGBUILD
+++ b/community/raw-thumbnailer/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A lightweight and fast raw image thumbnailer that can be used by file managers."
 url="http://code.google.com/p/raw-thumbnailer/"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libopenraw')
 source=(http://raw-thumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 sha1sums=('f34012062c0b1eaa10525722c36bd027b11ade2e')
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index 337f08e7a..55792e67b 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=rawstudio
 pkgver=2.0
 pkgrel=3
 pkgdesc="An open source raw-image converter written in GTK+"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://rawstudio.org/"
 depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index cc4126ef1..ee9a0c6fa 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=rawtherapee
 pkgver=4.0.6
 pkgrel=1
 pkgdesc="RAW photo editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
 license=('GPL')
 depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/community/rdiff-backup/PKGBUILD b/community/rdiff-backup/PKGBUILD
index 3ffb75bad..e4f34995e 100644
--- a/community/rdiff-backup/PKGBUILD
+++ b/community/rdiff-backup/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rdiff-backup
 pkgver=1.2.8
 pkgrel=5
 pkgdesc='A utility for local/remote mirroring and incremental backups.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/rdiff-backup/'
 license=('GPL')
 depends=('python2' 'librsync')
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 18bf8820e..35de41104 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=recoll
 pkgver=1.16.2
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesbonscomptes.com/recoll/"
 license=('GPL')
 depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme')
diff --git a/community/recordmydesktop/PKGBUILD b/community/recordmydesktop/PKGBUILD
index f559b7a2b..ce7dcecc7 100644
--- a/community/recordmydesktop/PKGBUILD
+++ b/community/recordmydesktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=recordmydesktop
 pkgver=0.3.8.1
 pkgrel=5
 pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://recordmydesktop.sourceforge.net"
 license=('GPL')
 depends=('alsa-lib' 'zlib' 'libvorbis' 'libxdamage' 'libxext' 'libtheora' 'libsm' 'jack')
diff --git a/community/recoverdm/PKGBUILD b/community/recoverdm/PKGBUILD
index 4ec2d1548..c1c4427f5 100644
--- a/community/recoverdm/PKGBUILD
+++ b/community/recoverdm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=recoverdm
 pkgver=0.20
 pkgrel=2
 pkgdesc="helps to recover disks with bad sectors"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vanheusden.com/recoverdm/"
 license=('GPL')
 depends=(glibc)
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 1d6f2f102..0efcbcd23 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=redis
 pkgver=2.4.6
 pkgrel=1
 pkgdesc="Advanced key-value store"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://redis.io/"
 #url="http://code.google.com/p/redis"
 license=('BSD')
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index 166657069..3a4ff3358 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=redshift
 pkgver=1.7
 pkgrel=1
 pkgdesc="Adjusts the color temperature of your screen according to your surroundings."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://jonls.dk/redshift/'
 license=('GPL3')
 depends=('gconf' 'libxxf86vm')
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 98f7886ad..f72b5a364 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rekonq
 pkgver=0.8.1
 pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://rekonq.kde.org/'
 license=('GPL')
 depends=('kdebase-keditbookmarks')
diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD
index 27bb61ee9..0927cd990 100644
--- a/community/remind/PKGBUILD
+++ b/community/remind/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=remind
 pkgver=3.01.10
 pkgrel=2
 pkgdesc='A sophisticated calendar and alarm progam.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.roaringpenguin.com/penguin/open_source_remind.php'
 license=('GPL')
 depends=('tk' 'tcllib')
diff --git a/community/remmina-plugins/PKGBUILD b/community/remmina-plugins/PKGBUILD
index 7b6007a69..9f94b7c05 100644
--- a/community/remmina-plugins/PKGBUILD
+++ b/community/remmina-plugins/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 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)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/remmina/"
 license=('GPL')
 conflicts=(remmina-plugins-svn)
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index be4e4b23b..b8f7dc5ed 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=remmina
 pkgver=0.9.3
 pkgrel=1
 pkgdesc="Remmina is a remote desktop client written in GTK+. "
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/remmina/"
 license=('GPL')
 provides=("grdc" "grdc=$pkgver")
diff --git a/community/rexima/PKGBUILD b/community/rexima/PKGBUILD
index 8342183de..47ea0dfb2 100644
--- a/community/rexima/PKGBUILD
+++ b/community/rexima/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rexima
 pkgver=1.4
 pkgrel=4
 pkgdesc="A curses-based interactive mixer."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.svgalib.org/rus/rexima.html"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/ripperx/PKGBUILD b/community/ripperx/PKGBUILD
index c3ce208a1..e8b694c28 100644
--- a/community/ripperx/PKGBUILD
+++ b/community/ripperx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ripperx
 pkgver=2.7.3
 pkgrel=1
 pkgdesc="GTK program to rip and encode mp3 files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://ripperx.sourceforge.net/"
 depends=('gtk2' 'id3lib')
 license=('GPL')
diff --git a/community/rlog/PKGBUILD b/community/rlog/PKGBUILD
index 48bf0832c..1ba965fe5 100644
--- a/community/rlog/PKGBUILD
+++ b/community/rlog/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rlog
 pkgver=1.4
 pkgrel=4
 pkgdesc="A flexible message logging facility for C++ programs and libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.arg0.net/rlog"
 license=('LGPL')
 depends=('gcc-libs')
diff --git a/community/rlwrap/PKGBUILD b/community/rlwrap/PKGBUILD
index 590bbe886..ca15bd42b 100644
--- a/community/rlwrap/PKGBUILD
+++ b/community/rlwrap/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=rlwrap
 pkgver=0.37
 pkgrel=1
 pkgdesc="A 'readline wrapper'"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
 license=('GPL')
 depends=('readline')
diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD
index 05cf440cf..6c24a6114 100644
--- a/community/rocksndiamonds/PKGBUILD
+++ b/community/rocksndiamonds/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rocksndiamonds
 pkgver=3.3.0.1
 pkgrel=1
 pkgdesc="game similiar to Boulderdash with lots of levels"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.artsoft.org/rocksndiamonds/"
 license=('GPL')
 depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data')
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 729d3377f..0e9aee589 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=root
 pkgver=5.32.00
 pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://root.cern.ch'
 license=('LGPL2.1')
 depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
diff --git a/community/rote/PKGBUILD b/community/rote/PKGBUILD
index d0043e679..6ef646b38 100644
--- a/community/rote/PKGBUILD
+++ b/community/rote/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rote
 pkgver=0.2.8
 pkgrel=2
 pkgdesc="terminal emulation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rote.sourceforge.net/"
 license=('GPL')
 depends=(ncurses)
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 1630b5894..66bbc18d0 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=roxterm
 pkgver=2.4.2
 pkgrel=2
 pkgdesc="Tabbed, VTE-based terminal emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://roxterm.sourceforge.net/"
 license=('GPL3')
 depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
diff --git a/community/rpc2/PKGBUILD b/community/rpc2/PKGBUILD
index 4719cdbfb..9f36f6777 100644
--- a/community/rpc2/PKGBUILD
+++ b/community/rpc2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rpc2
 pkgver=2.10
 pkgrel=2
 pkgdesc="Remote procedure call package for IP/UDP"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
 options=('!libtool')
 license=("LGPL")
diff --git a/community/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD
index d4c727c31..428c44b09 100644
--- a/community/rsnapshot/PKGBUILD
+++ b/community/rsnapshot/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=rsnapshot
 pkgver=1.3.1
 pkgrel=3
 pkgdesc="A remote filesystem snapshot utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rsnapshot.org"
 license=('GPL')
 depends=('perl' 'rsync' 'openssh')
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index fe9298029..f1e4c060c 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rss-glx
 pkgver=0.9.1
 pkgrel=8
 pkgdesc="The Really Slick Screensavers port to GLX"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rss-glx.sourceforge.net/"
 license=('GPL')
 depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick')
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index f91a9e5d5..6f0bfed5e 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=6.2.0
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('zlib' 'libestr' 'libee')
 makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD
index 0f387097d..7501d59d5 100644
--- a/community/rtorrent/PKGBUILD
+++ b/community/rtorrent/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Ncurses BitTorrent client based on libTorrent'
 url='http://libtorrent.rakshasa.no/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libtorrent=0.12.9' 'curl' 'xmlrpc-c')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce')
diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD
index 4c07e6ee6..a082bbacf 100644
--- a/community/ruby-cairo/PKGBUILD
+++ b/community/ruby-cairo/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=rcairo
 pkgver=1.10.0
 pkgrel=2
 pkgdesc="Ruby bindings for cairo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cairographics.org/rcairo/"
 license=('GPL')
 depends=('ruby' 'cairo>=1.2.0')
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 0db9d7688..ea3a3ba41 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango')
 pkgver=1.0.3
 pkgrel=2
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ruby-gnome2.sourceforge.jp/"
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2')
diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD
index 28a581ec8..96b89ac1c 100644
--- a/community/rusxmms/PKGBUILD
+++ b/community/rusxmms/PKGBUILD
@@ -8,7 +8,7 @@ _xmmsver=1.2.11
 _csaver=csa43
 pkgrel=3
 pkgdesc="XMMS with librcc"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(GPL)
 url="http://rusxmms.sourceforge.net/"
 depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl)
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index d240ce248..5e509bab0 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.7.2
 pkgrel=2
 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')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 #depends=('readline')
 depends=('ppl')
diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD
index c8cd7e2d5..aa0f750bb 100644
--- a/community/sakura/PKGBUILD
+++ b/community/sakura/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sakura
 pkgver=2.4.2
 pkgrel=1
 pkgdesc="A terminal emulator based on GTK and VTE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pleyades.net/david/sakura.php"
 license=('GPL')
 depends=('vte' 'libxft' 'desktop-file-utils')
diff --git a/community/sarg/PKGBUILD b/community/sarg/PKGBUILD
index 600cccdb1..dc61c3a03 100644
--- a/community/sarg/PKGBUILD
+++ b/community/sarg/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sarg
 pkgver=2.3.1
 pkgrel=3
 pkgdesc="Squid Analysis Report Generator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sarg.sourceforge.net"
 license=('GPL')
 depends=('gd' 'libldap')
diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD
index 96c166249..1d295ea75 100644
--- a/community/scantailor/PKGBUILD
+++ b/community/scantailor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scantailor
 pkgver=0.9.10
 pkgrel=1
 pkgdesc="Interactive post-processing tool for scanned pages"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://scantailor.sourceforge.net"
 license="GPL"
 depends=('qt')
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 6109c8c51..a2ae0f37e 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -10,7 +10,7 @@ url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
 depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
 optdepends=('btrfs-progs-unstable' 'lvm2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 conflicts=('dchroot')
 replaces=('dchroot')
 provides=('schroot' 'sbuild' 'dchroot')
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 1a48fee56..2b9d1321f 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=scite
 pkgver=3.0.2
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.scintilla.org/SciTE.html'
 license=('custom:scite')
 depends=('desktop-file-utils' 'gtk2')
diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD
index 42e9f414d..83c7a81b1 100644
--- a/community/scorched3d/PKGBUILD
+++ b/community/scorched3d/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=scorched3d
 pkgver=43.2a
 pkgrel=1
 pkgdesc="A 3d artillery combat game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scorched3d.co.uk/"
 license=('GPL')
 depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils')
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD
index edad16ccc..ab8a33cd0 100644
--- a/community/scponly/PKGBUILD
+++ b/community/scponly/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scponly
 pkgver=4.8
 pkgrel=7
 pkgdesc="A limited shell for ssh/scp"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sublimation.org/scponly/"
 depends=('glibc')
 makedepends=('openssh')
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
index 2bcc42643..d6565d2c7 100644
--- a/community/scrotwm/PKGBUILD
+++ b/community/scrotwm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scrotwm
 pkgver=0.10.0
 pkgrel=1
 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scrotwm.org"
 license=('custom:ISC')
 depends=('dmenu' 'libxrandr' 'libxtst' 'profont')
diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD
index 1dba7faf0..b00fd1046 100644
--- a/community/scummvm-tools/PKGBUILD
+++ b/community/scummvm-tools/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="A set of tools that enable you to convert, compress and decode game dat
 url="http://www.scummvm.org/"
 license=('GPL')
 depends=('libpng' 'wxgtk' 'flac' 'libvorbis')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz)
 md5sums=('43cbf9f5c4939876cf4149dd59e68044')
 
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index bb057dcce..d1358029e 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sdcc
 pkgver=3.1.0
 pkgrel=1
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('bash' 'gcc-libs' 'boost-libs')
 makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
diff --git a/community/sdd/PKGBUILD b/community/sdd/PKGBUILD
index 9b538c6e3..12d3ba464 100644
--- a/community/sdd/PKGBUILD
+++ b/community/sdd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sdd
 pkgver=1.52
 pkgrel=6
 pkgdesc="Faster replacement for a program called dd"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://freshmeat.net/projects/sdd/"
 source=(ftp://ftp.berlios.de/pub/sdd/sdd-$pkgver.tar.gz
diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD
index 42ab9590f..1fc73b7e8 100644
--- a/community/ser2net/PKGBUILD
+++ b/community/ser2net/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ser2net
 pkgver=2.7
 pkgrel=1
 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/ser2net"
 license=('GPL')
 depends=('glibc')
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 4d2318966..29a22b46e 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -12,7 +12,7 @@ fi
 
 pkgrel=1
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sfml-dev.org/'
 license=('zlib')
 depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
diff --git a/community/shake/PKGBUILD b/community/shake/PKGBUILD
index cc8f72da6..93099b11d 100644
--- a/community/shake/PKGBUILD
+++ b/community/shake/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=shake
 pkgver=0.999
 pkgrel=1
 pkgdesc="Userspace defragmenter that can be run while system is in use" 
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://vleu.net/shake/" 
 license=('GPL3')
 depends=('attr') 
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index 7021f6efa..ef72c4536 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=shapelib
 pkgver=1.2.10
 pkgrel=4
 pkgdesc='simple C API for reading and writing ESRI Shapefiles'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
 options=('!libtool')
diff --git a/community/shell-fm/PKGBUILD b/community/shell-fm/PKGBUILD
index d54031f18..2336657b7 100644
--- a/community/shell-fm/PKGBUILD
+++ b/community/shell-fm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=shell-fm
 pkgver=0.7
 pkgrel=3
 pkgdesc="A console based player for the streams provided by Last.FM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/jkramer/$pkgname"
 license=('GPL')
 depends=('libmad' 'libao' 'taglib')
diff --git a/community/shfs-utils/PKGBUILD b/community/shfs-utils/PKGBUILD
index 13477b23d..cf1bf70a9 100644
--- a/community/shfs-utils/PKGBUILD
+++ b/community/shfs-utils/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="SHell FileSystem Linux utils"
 url="http://shfs.sourceforge.net/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'openssh')
 makedepends=('patch')
 source=(http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz \
diff --git a/community/shntool/PKGBUILD b/community/shntool/PKGBUILD
index ea261ecea..51b020f1f 100644
--- a/community/shntool/PKGBUILD
+++ b/community/shntool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=shntool
 pkgver=3.0.10
 pkgrel=2
 pkgdesc="A multi-purpose WAVE data processing and reporting utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.etree.org/shnutils/shntool/"
 license=('GPL')
 options=(!emptydirs)
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index db9b90cb5..0e965efba 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=shotwell
 pkgver=0.11.6
 pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
 depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
diff --git a/community/shuffle/PKGBUILD b/community/shuffle/PKGBUILD
index e13598c9f..d85a4b641 100644
--- a/community/shuffle/PKGBUILD
+++ b/community/shuffle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=shuffle
 pkgver=1.5
 pkgrel=3
 pkgdesc="Shuffles lines of input."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.w3.org/People/Bos/Shuffle/"
 license=('custom')
 depends=(glibc)
diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD
index 3910b7133..75396a1f8 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=siege
 pkgver=2.70
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="An http regression testing and benchmarking utility"
 url="http://www.joedog.org/JoeDog/Siege"
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index c3d982595..cfb9b390e 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sigil
 pkgver=0.5.0
 pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'mips64el') 
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
 depends=('qtwebkit')
diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD
index 390c82194..4aa34ede2 100644
--- a/community/silly/PKGBUILD
+++ b/community/silly/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=silly
 pkgver=0.1.0
 pkgrel=4
 pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cegui.org.uk/wiki/index.php/SILLY"
 license=('MIT')
 depends=('libjpeg' 'libpng' 'gcc-libs')
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 4db428d90..900d8683e 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=simgear
 pkgver=2.4.0
 pkgrel=1
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
 makedepends=('boost')
 license=("GPL")
diff --git a/community/simh/PKGBUILD b/community/simh/PKGBUILD
index d3590dcd4..e1edd93e9 100644
--- a/community/simh/PKGBUILD
+++ b/community/simh/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.8.1
 _pkgver=38-1
 pkgrel=2
 pkgdesc="simulator for assorted historical computers, from Altair to VAX"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://simh.trailing-edge.com"
 license=("BSD")
 depends=("libpcap" "glibc")
diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD
index 78b42754c..f1c053ce3 100644
--- a/community/simple-scan/PKGBUILD
+++ b/community/simple-scan/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=simple-scan
 pkgver=3.2.1
 pkgrel=1
 pkgdesc='Simple scanning utility'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://launchpad.net/simple-scan'
 license=('GPL3')
 depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme')
diff --git a/community/sisctrl/PKGBUILD b/community/sisctrl/PKGBUILD
index e691edfe2..36379e068 100644
--- a/community/sisctrl/PKGBUILD
+++ b/community/sisctrl/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=sisctrl
 pkgver=0.0.20051202
 pkgrel=5
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="SiSCtrl is Display Control Panel for XFree86/X.org SiS driver"
 makedepends=('pkgconfig')
 depends=('gtk2' 'libxxf86vm' 'libxv')
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD
index 551df34a5..1356364d3 100644
--- a/community/sk1/PKGBUILD
+++ b/community/sk1/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sk1
 pkgver=0.9.1
 pkgrel=6
 pkgdesc="Fork of skencil with improved CMYK support"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sk1project.org/modules.php?name=Products&product=sk1"
 depends=('tcl>=7.6' 'tk>=4.2' 'python-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs')
 license=('GPL' 'LGPL')
diff --git a/community/sk1libs/PKGBUILD b/community/sk1libs/PKGBUILD
index e5c014b93..120f51a3c 100644
--- a/community/sk1libs/PKGBUILD
+++ b/community/sk1libs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sk1libs
 pkgver=0.9.1
 pkgrel=2
 pkgdesc='A set of python non-GUI extensions for sK1 Project.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sk1project.org/'
 license=('custom:LGPL2')
 depends=('python2' 'freetype2' 'lcms')
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index cf52881d5..62a991564 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=skrooge
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://skrooge.org/"
 license=('GPL')
 depends=('kdebase-runtime' 'libofx' 'qca-ossl')
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index 7ee4b11e7..5eb29e6a9 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sleuthkit
 pkgver=3.2.3
 pkgrel=1
 pkgdesc='File system and media management forensic analysis tools'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sleuthkit.org/sleuthkit'
 license=('GPL2' 'CPL' 'custom:"IBM Public Licence"')
 depends=('perl')
diff --git a/community/slimevolley/PKGBUILD b/community/slimevolley/PKGBUILD
index 0259f974e..9f49ec6bb 100644
--- a/community/slimevolley/PKGBUILD
+++ b/community/slimevolley/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slimevolley
 pkgver=2.4.2
 pkgrel=1
 pkgdesc="A simple yet fun arcade volley game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://slime.tuxfamily.org/index.php"
 license=('GPL')
 depends=('sdl_net' 'sdl_ttf' 'sdl_image')
diff --git a/community/sloccount/PKGBUILD b/community/sloccount/PKGBUILD
index 268e4d74b..93a967095 100644
--- a/community/sloccount/PKGBUILD
+++ b/community/sloccount/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="Tools for counting physical source lines of code"
 url="http://www.dwheeler.com/sloccount/"
 license=('GPL')
 depends=('perl')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://www.dwheeler.com/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('09abd6e2a016ebaf7552068a1dba1249')
 
diff --git a/community/slock/PKGBUILD b/community/slock/PKGBUILD
index 678470104..2d338fabb 100644
--- a/community/slock/PKGBUILD
+++ b/community/slock/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.9
 _pkgver="4d3769ac5d02"
 pkgrel=6
 pkgdesc="A simple screen locker for X"
-arch=('i686' 'x86_64')
+arch=('mips64el' 'i686' 'x86_64')
 url="http://tools.suckless.org/slock"
 license=('MIT')
 depends=('libxext')
diff --git a/community/slrn/PKGBUILD b/community/slrn/PKGBUILD
index 907711e16..0cfad4b25 100644
--- a/community/slrn/PKGBUILD
+++ b/community/slrn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slrn
 pkgver=0.9.9p1
 pkgrel=6
 pkgdesc="An open source text-based news client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.slrn.org/"
 license=('GPL')
 depends=('openssl' 'slang')
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index eeacd6d27..eb69eeed3 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool' '!emptydirs')
 
 depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl')
diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD
index 28b778a21..5f6554be9 100644
--- a/community/smbnetfs/PKGBUILD
+++ b/community/smbnetfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=smbnetfs
 pkgver=0.5.3a
 pkgrel=3
 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://smbnetfs.sourceforge.net/"
 license=('GPL')
 depends=('fuse' 'smbclient')
diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD
index b93398345..7e0222034 100644
--- a/community/smc/PKGBUILD
+++ b/community/smc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=smc
 pkgver=1.9
 pkgrel=13
 pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.secretmaryo.org/"
 license=('GPL3')
 depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD
index 9843a5a1e..4bb48b41b 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -11,7 +11,7 @@ url="http://www.selenic.com/smem/"
 license=("GPL")
 depends=('python2')
 optdepends=('python-matplotlib: for chart generation')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.selenic.com/smem/download/${pkgname}-${pkgver}.tar.gz")
 md5sums=('5620f20cae4d4f0e8eb33bdc2736b0f3')
 
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index 56fca9456..cf9ef1e77 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sniffit
 pkgver=0.3.7.beta
 pkgrel=10
 pkgdesc="very good packet sniffer for unix with ncurses interactive mode."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.ubuntu.com/source/sniffit"
 #seems the website are out, ubuntu have all sources
 #url=http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD
index 9a9a03107..178925eb6 100644
--- a/community/snort/PKGBUILD
+++ b/community/snort/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=snort
 pkgver=2.9.2.1
 pkgrel=1
 pkgdesc='A lightweight network intrusion detection system.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.snort.org'
 license=('GPL')
 depends=('libdaq' 'libdnet' 'libpcap' 'pcre' 'zlib')
diff --git a/community/snownews/PKGBUILD b/community/snownews/PKGBUILD
index 1f7619dff..a6bbb6222 100644
--- a/community/snownews/PKGBUILD
+++ b/community/snownews/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=snownews
 pkgver=1.5.12
 pkgrel=4
 pkgdesc="Text mode RSS newsreader for Linux and Unix."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://kiza.kcore.de/software/snownews/"
 license=('GPL')
 depends=('libxml2' 'ncurses' 'perl-xml-libxml' 'perl-xml-libxslt' 'openssl')
diff --git a/community/soil/PKGBUILD b/community/soil/PKGBUILD
index ce0fae6b5..8d7e48609 100644
--- a/community/soil/PKGBUILD
+++ b/community/soil/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=soil
 pkgver=0708
 pkgrel=1
 pkgdesc="tiny C lib primarily for loading textures into OpenGL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lonesock.net/soil.html"
 license=('public')
 makedepends=('unzip')
diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD
index 4ae1a450f..fe0e9511f 100644
--- a/community/solfege/PKGBUILD
+++ b/community/solfege/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=solfege
 pkgver=3.20.4
 pkgrel=1
 pkgdesc="Music education and ear training software"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.solfege.org/"
 license=('GPL3')
 depends=('pygtk' 'libgtkhtml')
diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD
index 2240b72f5..113f78180 100644
--- a/community/soundkonverter/PKGBUILD
+++ b/community/soundkonverter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=soundkonverter
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="Front-end to various audio converters"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=29024"
 license=('GPL')
 depends=('kdemultimedia-kioslave' 'taglib')
diff --git a/community/spawn-fcgi/PKGBUILD b/community/spawn-fcgi/PKGBUILD
index 6b20d17c9..4bbf779d9 100644
--- a/community/spawn-fcgi/PKGBUILD
+++ b/community/spawn-fcgi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=spawn-fcgi
 pkgver=1.6.3
 pkgrel=2
 pkgdesc='A FastCGI process manager for web applications'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://redmine.lighttpd.net/projects/spawn-fcgi/'
 license=('BSD')
 depends=('glibc')
diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD
index 990763d56..1532b9514 100644
--- a/community/speed-dreams/PKGBUILD
+++ b/community/speed-dreams/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.0b1
 _pkgver=2.0.0-b1-r3937
 pkgrel=1
 pkgdesc="A racing simulator with rich graphics and physics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD
index f6559ab07..bc31421a9 100644
--- a/community/splint/PKGBUILD
+++ b/community/splint/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=splint
 pkgver=3.1.2
 pkgrel=3
 pkgdesc="A tool for statically checking C programs for security vulnerabilities and coding mistakes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.splint.org/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/splix/PKGBUILD b/community/splix/PKGBUILD
index 746a1a2d9..e2962a372 100644
--- a/community/splix/PKGBUILD
+++ b/community/splix/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=splix
 pkgver=2.0.0
 pkgrel=10
 pkgdesc="CUPS drivers for SPL (Samsung Printer Language) printers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://splix.ap2c.org/"
 license=('GPL')
 depends=('libcups' 'gcc-libs' 'ghostscript>=9.02')
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index c39b42e45..a5f192e51 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.85.0
 _pkgver=85.0
 pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
 license=('GPL')
 depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index 01eedb6c2..d44f0bfcc 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=springlobby
 pkgver=0.141
 pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://springlobby.info/"
 license=('GPL2')
 depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
diff --git a/community/sqlite2/PKGBUILD b/community/sqlite2/PKGBUILD
index 0f8ff8f22..b5d55b427 100644
--- a/community/sqlite2/PKGBUILD
+++ b/community/sqlite2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sqlite2
 pkgver=2.8.17
 pkgrel=4
 pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sqlite.org/"
 depends=('readline>=6.0.00')
 source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz 'LICENSE')
diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD
index d80b89ce7..d1f7f1194 100644
--- a/community/sqlitebrowser/PKGBUILD
+++ b/community/sqlitebrowser/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.0b1
 _pkgrealver=200_b1
 pkgrel=1
 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sqlitebrowser.sf.net"
 license=('GPL')
 depends=('qt')
diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD
index db984ea91..83ca34614 100644
--- a/community/sqliteman/PKGBUILD
+++ b/community/sqliteman/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=sqliteman
 pkgver=1.2.2
 pkgrel=5
 pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sqliteman.sf.net"
 license=('GPL')
 depends=('qscintilla')
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index 5ca67f8ca..5ee766ced 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib' 'lzo2' 'xz')
 source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz")
 md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 0de299933..405321d03 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sshguard
 pkgver=1.5
 pkgrel=3
 pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #url="http://sourceforge.net/projects/sshguard/"
 url="http://www.sshguard.net/"
 license=('GPL')
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index d4e795cc7..2f882aa11 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sslh
 pkgver=1.10
 pkgrel=5
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.rutschle.net/tech/sslh.shtml'
 license=('GPL2')
 backup=('etc/conf.d/sslh')
diff --git a/community/stalonetray/PKGBUILD b/community/stalonetray/PKGBUILD
index a55e8abeb..51a4eaf95 100644
--- a/community/stalonetray/PKGBUILD
+++ b/community/stalonetray/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=stalonetray
 pkgver=0.8.1
 pkgrel=1
 pkgdesc="STAnd-aLONE sysTRAY. It has minimal build and run-time dependencies: the Xlib only."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://stalonetray.sourceforge.net"
 license=('GPL')
 depends=('libx11' 'libxpm')
diff --git a/community/steghide/PKGBUILD b/community/steghide/PKGBUILD
index 4eb872e74..26e76cdbd 100644
--- a/community/steghide/PKGBUILD
+++ b/community/steghide/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=steghide
 pkgver=0.5.1
 pkgrel=5
 pkgdesc='Embeds a message in a file by replacing some of the least significant bits.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://steghide.sourceforge.net'
 license=('GPL')
 depends=('libmcrypt' 'mhash' 'gcc' 'libjpeg' 'zlib' 'libtool')
diff --git a/community/stfl/PKGBUILD b/community/stfl/PKGBUILD
index c972edb2d..2bf1dda14 100644
--- a/community/stfl/PKGBUILD
+++ b/community/stfl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stfl
 pkgver=0.21
 pkgrel=3
 pkgdesc="Library implementing a curses-based widget set for text terminals"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clifford.at/stfl/"
 license=('GPL3')
 depends=('ncurses')
diff --git a/community/stk/PKGBUILD b/community/stk/PKGBUILD
index 498763465..1b7a9dba8 100644
--- a/community/stk/PKGBUILD
+++ b/community/stk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=stk
 pkgver=4.4.2
 pkgrel=6
 pkgdesc="The Synthesis ToolKit in C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ccrma.stanford.edu/software/stk/"
 license=('MIT')
 depends=('gcc-libs' 'jack')
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 54fc98c25..6f906779a 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=stone-soup
 pkgver=0.9.1
 pkgrel=1
 pkgdesc='An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
 depends=('lua' 'ncurses' 'sdl_image' 'sqlite3' 'libgl' 'mesa' 'freetype2')
 makedepends=('bison' 'flex')
diff --git a/community/stormbaancoureur/PKGBUILD b/community/stormbaancoureur/PKGBUILD
index 484d4371f..e3b15df2c 100644
--- a/community/stormbaancoureur/PKGBUILD
+++ b/community/stormbaancoureur/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=stormbaancoureur
 pkgver=2.1.6
 pkgrel=1
 pkgdesc="Arcade-style car game based on physics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.stolk.org/stormbaancoureur/"
 license=('GPL')
 depends=('freeglut' 'alsa-lib')
diff --git a/community/stress/PKGBUILD b/community/stress/PKGBUILD
index c755912fd..7c6340f2f 100644
--- a/community/stress/PKGBUILD
+++ b/community/stress/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stress
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="A tool that stress tests your system (CPU, memory, I/O, disks)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://weather.ou.edu/~apw/projects/stress/"
 license=('GPL')
 options=('!emptydirs')
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index fac1cd3b5..ed5f0c53c 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=stunnel
 pkgver=4.52
 pkgrel=1
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.stunnel.org"
 license=('GPL')
 depends=('openssl')
diff --git a/community/subtitleeditor/PKGBUILD b/community/subtitleeditor/PKGBUILD
index 17580677f..e0d167b0d 100644
--- a/community/subtitleeditor/PKGBUILD
+++ b/community/subtitleeditor/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=subtitleeditor
 pkgver=0.39.0
 pkgrel=1
 pkgdesc="A GTK+2 tool to edit subtitles for GNU/Linux/*BSD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://home.gna.org/subtitleeditor/"
 license=('GPL3')
 depends=('enchant' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamermm' 'gtk2' 'gtkmm' 'hicolor-icon-theme' 'libsigc++' 'libxml++' 'xdg-utils')
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index 0173189be..53211f509 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=subtle
 pkgver=0.10.3008
 pkgrel=2
 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://subtle.subforge.org"
 license=("GPL")
 depends=("libx11" "ruby")
diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD
index 55c909ffe..28943e362 100644
--- a/community/sunpinyin/PKGBUILD
+++ b/community/sunpinyin/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=sunpinyin
 pkgver=2.0.3
 pkgrel=1
 pkgdesc='SunPinYin is a Statistical Language Model based pinyin IME by Sun.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sunpinyin.googlecode.com'
 license=('LGPL')
 makedepends=('scons')
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 60606f57c..563f2e415 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=supertux
 pkgver=0.3.3
 pkgrel=4
 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://super-tux.sourceforge.net/"
 license=('GPL')
 depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew')
diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index 0cbd840c7..dcb29d348 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=supertuxkart
 pkgver=0.7
 pkgrel=1
 pkgdesc="A kart racing game featuring Tux and his friends"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://supertuxkart.sourceforge.net/"
 license=('GPL2')
 depends=('irrlicht' 'openal' 'libvorbis')
diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD
index 9929db995..d6f3420e6 100644
--- a/community/surf/PKGBUILD
+++ b/community/surf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=surf
 pkgver=0.4.1
 pkgrel=3
 pkgdesc="A simple web browser based on WebKit/GTK+."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://surf.suckless.org/'
 license=('MIT')
 depends=('libwebkit' 'xorg-xprop')
diff --git a/community/swarp/PKGBUILD b/community/swarp/PKGBUILD
index 31cf3ca96..c11c1cd76 100644
--- a/community/swarp/PKGBUILD
+++ b/community/swarp/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.1
 pkgrel=2
 pkgdesc="Simple pointer warp"
 license=('MIT')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://tools.suckless.org/"
 depends=(glibc libx11)
 source=(http://dl.suckless.org/tools/swarp-$pkgver.tar.gz
diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD
index 061a58fb1..5dbf41f29 100644
--- a/community/swftools/PKGBUILD
+++ b/community/swftools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=swftools
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="A collection of SWF manipulation and creation utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swftools.org/"
 license=('GPL')
 depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD
index 5a43c9910..1a8bcedb2 100644
--- a/community/swi-prolog/PKGBUILD
+++ b/community/swi-prolog/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=swi-prolog
 pkgver=5.10.5
 pkgrel=3
 pkgdesc='Prolog environment'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.swi-prolog.org/'
 license=('GPL' 'LGPL')
 depends=('gmp' 'readline' 'openssl')
diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD
index 70d7a4ca4..950c35862 100644
--- a/community/sword/PKGBUILD
+++ b/community/sword/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sword
 pkgver=1.6.2
 pkgrel=6
 pkgdesc="Libraries for Bible programs"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.crosswire.org/sword/"
 license=('GPL')
 depends=('curl' 'clucene' 'swig')
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 4990e0a51..9f4eec24e 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sxiv
 pkgver=1.0
 pkgrel=1
 pkgdesc='simple x image viewer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
diff --git a/community/synce-libmimedir/PKGBUILD b/community/synce-libmimedir/PKGBUILD
index fd928a779..323f3c742 100644
--- a/community/synce-libmimedir/PKGBUILD
+++ b/community/synce-libmimedir/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-libmimedir
 pkgver=0.4
 pkgrel=3
 pkgdesc="provide a means of communication with a Windows CE device - library that parses MIME Directory Profile."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 source=(http://downloads.sourceforge.net/sourceforge/synce/libmimedir-$pkgver.tar.gz)
diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD
index 85a2e946f..b8c8123c0 100644
--- a/community/synce-librapi/PKGBUILD
+++ b/community/synce-librapi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-librapi
 pkgver=0.15.2
 pkgrel=2
 pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('synce-libsynce')
diff --git a/community/synce-libsynce/PKGBUILD b/community/synce-libsynce/PKGBUILD
index d0fb0be38..1329374b6 100644
--- a/community/synce-libsynce/PKGBUILD
+++ b/community/synce-libsynce/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-libsynce
 pkgver=0.15.1
 pkgrel=2
 pkgdesc="provide a means of communication with a Windows CE device - libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('dbus-glib')
diff --git a/community/synce-rra/PKGBUILD b/community/synce-rra/PKGBUILD
index 0a305f882..aad00d2a7 100644
--- a/community/synce-rra/PKGBUILD
+++ b/community/synce-rra/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-rra
 pkgver=0.14
 pkgrel=4
 pkgdesc="provide a means of communication with a Windows CE device - rra libraries for synce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'synce-librapi' 'synce-libmimedir')
diff --git a/community/synce-serial/PKGBUILD b/community/synce-serial/PKGBUILD
index 56375e689..4d08a823d 100644
--- a/community/synce-serial/PKGBUILD
+++ b/community/synce-serial/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-serial
 pkgver=0.11
 pkgrel=3
 pkgdesc="provide a means of communication with a Windows CE device - helper scripts for setting up a serial connection"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 depends=(sh)
 license=('GPL')
diff --git a/community/synce-vdccm/PKGBUILD b/community/synce-vdccm/PKGBUILD
index 384394e78..d2e7c3d0b 100644
--- a/community/synce-vdccm/PKGBUILD
+++ b/community/synce-vdccm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-vdccm
 pkgver=0.10.1
 pkgrel=3
 pkgdesc="provide a means of communication with a Windows CE device - daemon to communicate with a handheld device"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('synce-libsynce')
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index e23adadc2..c03f1d511 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.3.8
 pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs' 'libxtst' 'libxinerama' )
 license=('GPL2')
 makedepends=('libxt' 'cmake')       # used by configure to test for libx11...
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 53671e957..f0ebb3f77 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synfig
 pkgver=0.63.03
 pkgrel=1
 pkgdesc="Professional vector animation program (CLI renderer only)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
 license=('GPL2')
 depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng'
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index bbd4b7842..591c3d8d1 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synfigstudio
 pkgver=0.63.03
 pkgrel=2
 pkgdesc="Professional vector animation program (GUI)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
 license=('GPL2')
 depends=('gtkmm' 'synfig')
diff --git a/community/sysprof/PKGBUILD b/community/sysprof/PKGBUILD
index 697cdc142..65072e103 100644
--- a/community/sysprof/PKGBUILD
+++ b/community/sysprof/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=sysprof
 pkgver=1.1.8
 pkgrel=1
 pkgdesc="A sampling CPU profiler that uses a Linux kernel module to profile the entire system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.daimi.au.dk/~sandmann/sysprof/"
 license=("GPL")
 source=(http://www.daimi.au.dk/~sandmann/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index cf6c4299d..056de4602 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sysstat
 pkgver=10.0.3
 pkgrel=2
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pagesperso-orange.fr/sebastien.godard/"
 license=('GPL')
 depends=('lm_sensors')
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 3880c281c..7ae0e15f8 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=systemd
 pkgver=37
 pkgrel=3
 pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
 depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
diff --git a/community/t1utils/PKGBUILD b/community/t1utils/PKGBUILD
index 73d8e0204..9d23ff14d 100644
--- a/community/t1utils/PKGBUILD
+++ b/community/t1utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=t1utils
 pkgver=1.36
 pkgrel=1
 pkgdesc="A collection of simple Type 1 font manipulation programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lcdf.org/~eddietwo/type/#t1utils"
 license=("custom")
 depends=('glibc')
diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD
index aa0c1f369..142c68a81 100644
--- a/community/tabbed/PKGBUILD
+++ b/community/tabbed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tabbed
 pkgver=0.3
 pkgrel=2
 pkgdesc='Simple generic tabbed fronted to xembed aware applications.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tools.suckless.org/tabbed'
 license=('custom:MIT/X')
 depends=('libx11')
diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD
index 673927582..e34ef6d7a 100644
--- a/community/taglib-rcc/PKGBUILD
+++ b/community/taglib-rcc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=taglib-rcc
 pkgver=1.7
 pkgrel=1
 pkgdesc="taglib with librcc patch"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.kde.org/~wheeler/taglib.html"
 depends=('gcc-libs' 'zlib' 'bash' 'libxml2' 'db' 'librcc')
 makedepends=('patch' 'cmake')
diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD
index 9190b78a8..b2751c52d 100644
--- a/community/tagpy/PKGBUILD
+++ b/community/tagpy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tagpy
 pkgver=0.94.8
 pkgrel=6
 pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/tagpy"
 license=('MIT')
 depends=('python2' 'taglib' 'boost-libs')
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index afb1493ee..3e007656d 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=task
 pkgver=1.9.4
 pkgrel=2
 pkgdesc="A command-line todo list manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
 license=('GPL')
 depends=()
diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD
index 676929097..e843a55bf 100644
--- a/community/tasks/PKGBUILD
+++ b/community/tasks/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tasks
 pkgver=0.20
 pkgrel=1
 pkgdesc="A simple to do list application that uses libecal"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://pimlico-project.org/tasks.html"
 license=('GPL')
 depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2')
diff --git a/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD
index cf8bbbf33..f2d674ea2 100644
--- a/community/tcpflow/PKGBUILD
+++ b/community/tcpflow/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tcpflow
 pkgver=0.21
 pkgrel=4
 pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.circlemud.org/~jelson/software/tcpflow/"
 license=('GPL')
 depends=('libpcap')
diff --git a/community/tcpreplay/PKGBUILD b/community/tcpreplay/PKGBUILD
index 054c87d7e..e23d33089 100644
--- a/community/tcpreplay/PKGBUILD
+++ b/community/tcpreplay/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.4.4
 pkgrel=3
 pkgdesc="Gives the ability to replay previously captured traffic in a libpcap format"
 url="http://tcpreplay.synfin.net"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('libpcap' 'libdnet')
 makedepends=('tcpdump')
diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD
index a1ac07f5b..fda586748 100644
--- a/community/tcsh/PKGBUILD
+++ b/community/tcsh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tcsh
 pkgver=6.17.00
 pkgrel=4
 pkgdesc='Enhanced version of the Berkeley C shell.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.tcsh.org/Welcome'
 license=('BSD')
 depends=('ncurses')
diff --git a/community/tdfsb/PKGBUILD b/community/tdfsb/PKGBUILD
index 8c80e350b..668abdad0 100644
--- a/community/tdfsb/PKGBUILD
+++ b/community/tdfsb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tdfsb
 pkgver=0.0.10
 pkgrel=5
 pkgdesc="SDL based graphical file browser"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.determinate.net/webdata/seg/tdfsb.html"
 license=('GPL')
 depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu')
diff --git a/community/tdl/PKGBUILD b/community/tdl/PKGBUILD
index f848c12a9..326787a77 100644
--- a/community/tdl/PKGBUILD
+++ b/community/tdl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tdl
 pkgver=1.5.2
 pkgrel=4
 pkgdesc="tdl is a to-do list manager."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rc0.org.uk/tdl/"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 09e64feba..2ac60989e 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=tea
 pkgver=31.2.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tea-editor.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'aspell' 'hunspell')
diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD
index 0a62bc597..f97ffc653 100644
--- a/community/ted/PKGBUILD
+++ b/community/ted/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ted
 pkgver=2.21
 pkgrel=2
 pkgdesc="An easy rich text processor (with footnote support)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nllgg.nl/Ted/"
 depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
 license=('GPL')
diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD
index 4263f59c7..4c9f80ea9 100644
--- a/community/teeworlds/PKGBUILD
+++ b/community/teeworlds/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.6.1
 _bamver=0.4.0
 pkgrel=1
 pkgdesc="A multiplayer 2D shooter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://teeworlds.com"
 license=('custom')
 depends=('alsa-lib' 'mesa' 'sdl' 'freetype2')
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index 4377089ff..186518a6f 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tellico
 pkgver=2.3.5
 pkgrel=1
 pkgdesc="A collection manager for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tellico-project.org/"
 license=('GPL')
 depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib'
diff --git a/community/terminator/PKGBUILD b/community/terminator/PKGBUILD
index eaacd67d3..817bf2368 100644
--- a/community/terminator/PKGBUILD
+++ b/community/terminator/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=terminator
 pkgver=0.96
 pkgrel=1
 pkgdesc='an application that provides lots of terminals in a single window'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.tenshu.net/terminator/'
 license=('GPL2')
 depends=('vte' 'pygtk' 'xdg-utils')
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index c228c1ca5..66fd9e8f8 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tesseract
 pkgver=3.01
 pkgrel=1
 pkgdesc="An OCR programm"
-arch=(x86_64 i686)
+arch=(x86_64 i686 'mips64el')
 url="http://code.google.com/p/tesseract-ocr"
 license=("APACHE")
 depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica)
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index d29b5b9ae..ce71432bb 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=texmaker
 pkgver=3.2.2
 pkgrel=1
 pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xm1math.net/texmaker/index.html"
 license=('GPL')
 install='texmaker.install'
diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD
index 32dc337aa..a76b828bc 100644
--- a/community/texvc/PKGBUILD
+++ b/community/texvc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.18.0
 _svnrev=103240
 pkgrel=1
 pkgdesc="tex to HTML/MathML/png converter used by mediawiki"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.mediawiki.org/wiki/Extension:Math"
 license=("GPL")
 depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra')
diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD
index 87e5e4dd8..9a2b54b02 100644
--- a/community/tig/PKGBUILD
+++ b/community/tig/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Text-mode interface for git"
 depends=('git' 'ncurses')
 url="http://jonas.nitro.dk/tig/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz")
 md5sums=('4fa9e33c5daa76b6fed11e068405356f')
 
diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD
index 7e58700e9..34658be55 100644
--- a/community/tilda/PKGBUILD
+++ b/community/tilda/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tilda
 pkgver=0.9.6
 pkgrel=4
 pkgdesc="Linux terminal based on classic terminals from first person shooter games"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tilda.sourceforge.net"
 license=('GPL')
 depends=('vte' 'confuse' 'libglade')
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index b9d82940a..b1ea69203 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tinc
 pkgver=1.0.16
 pkgrel=1
 pkgdesc="VPN (Virtual Private Network) daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'openssl')
diff --git a/community/tint2/PKGBUILD b/community/tint2/PKGBUILD
index cdafa8d73..c8562dd4b 100644
--- a/community/tint2/PKGBUILD
+++ b/community/tint2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tint2
 pkgver=0.11
 pkgrel=4
 pkgdesc="A basic, good-looking task manager for WMs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/tint2/"
 license=('GPL2')
 conflicts=('ttm-svn' 'tint')
diff --git a/community/tinycdb/PKGBUILD b/community/tinycdb/PKGBUILD
index a56b8dc9d..dd9bce78e 100644
--- a/community/tinycdb/PKGBUILD
+++ b/community/tinycdb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tinycdb
 pkgver=0.77
 pkgrel=3
 pkgdesc="very fast and simple package for creating and reading constant data bases"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.corpit.ru/mjt/tinycdb.html"
 license=("GPL")
 depends=(glibc)
diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index 478eb7fce..230ccbc55 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tinyproxy
 pkgver=1.8.3
 pkgrel=3
 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://banu.com/tinyproxy/'
 license=('GPL')
 makedepends=('asciidoc')
diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD
index 43767818f..524c14522 100644
--- a/community/tipp10/PKGBUILD
+++ b/community/tipp10/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tipp10
 pkgver=2.1.0
 pkgrel=3
 pkgdesc="intelligent typing tutor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tipp10.com/"
 license=('GPL2')
 depends=('qt>=4.2.2')
diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD
index e84b40f36..f82903c16 100644
--- a/community/tix/PKGBUILD
+++ b/community/tix/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tix
 pkgver=8.4.3
 pkgrel=2
 pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
-arch=(i686 'x86_64')
+arch=(i686 'x86_64' 'mips64el')
 url="http://tix.sourceforge.net/"
 license=("BSD")
 depends=('tk' 'python' 'libx11')
diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD
index a5ee12746..d8dcee95c 100644
--- a/community/tksystray/PKGBUILD
+++ b/community/tksystray/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tksystray
 pkgver=0.1
 pkgrel=4
 pkgdesc="tksystray is compatible with freedesktop.org standarts systray for Tk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tkabber.jabber.ru/tksystray"
 license=("GPL")
 depends=(tcl tk imlib)
diff --git a/community/tktheme/PKGBUILD b/community/tktheme/PKGBUILD
index 910ce9557..5f9a7a64b 100644
--- a/community/tktheme/PKGBUILD
+++ b/community/tktheme/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tktheme
 pkgver=0.23
 pkgrel=6
 pkgdesc="A library to allow Tkabber docking in the system tray."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('tk' 'libxpm' 'libxmu')
 license=("GPL")
 source=(http://tkabber.jabber.ru/files/other/Tk_Theme-23.tgz)
diff --git a/community/tls/PKGBUILD b/community/tls/PKGBUILD
index 661973fe7..a12e807fb 100644
--- a/community/tls/PKGBUILD
+++ b/community/tls/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tls
 pkgver=1.6
 pkgrel=4
 pkgdesc="OpenSSL extension to Tcl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tls.sourceforge.net/"
 license=('GPL')
 depends=('tcl' 'openssl' 'awk')
diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD
index 560d82af7..6f5bf908f 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.6
 pkgrel=1
 pkgdesc="A terminal multiplexer"
 url="http://tmux.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('ncurses' 'libevent')
 source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz
diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD
index 53de9a0a3..fd1c65b13 100644
--- a/community/tmw/PKGBUILD
+++ b/community/tmw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tmw
 pkgver=0.5.2
 pkgrel=1
 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://themanaworld.org"
 license=('GPL')
 depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' 
diff --git a/community/tnef/PKGBUILD b/community/tnef/PKGBUILD
index 86b319b14..e1e521a55 100644
--- a/community/tnef/PKGBUILD
+++ b/community/tnef/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=tnef
 pkgver=1.4.8
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="Program which operates like tar to unpack the files inside an ms-tnef MIME attachment"
 url="http://sourceforge.net/projects/tnef/"
 license=('GPL')
diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD
index 6ca660613..1dfa52704 100644
--- a/community/tnftp/PKGBUILD
+++ b/community/tnftp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tnftp
 pkgver=20100108
 pkgrel=2
 pkgdesc="NetBSD FTP client with several advanced features"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 license=('BSD')
 depends=('ncurses' 'dante')
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index 0532eff09..a9bd200a1 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -9,7 +9,7 @@ _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')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tomoyo.sourceforge.jp'
 #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
 license=('GPL')
diff --git a/community/toolame/PKGBUILD b/community/toolame/PKGBUILD
index 0f9fd76e3..b4ba3d230 100644
--- a/community/toolame/PKGBUILD
+++ b/community/toolame/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=toolame
 pkgver=02l
 pkgrel=8
 pkgdesc="An optimized mpeg 1/2 layer 2 audio encoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/toolame"
 license=('LGPL')
 depends=('glibc')
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index 91422a36c..ab0cdf7ca 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tor
 pkgver=0.2.2.35
 pkgrel=1
 pkgdesc='Anonymizing overlay network.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.torproject.org/'
 license=('BSD')
 depends=('openssl' 'libevent' 'tsocks' 'bash')
diff --git a/community/torch/PKGBUILD b/community/torch/PKGBUILD
index c9691a6f6..f7b5d89ce 100644
--- a/community/torch/PKGBUILD
+++ b/community/torch/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=torch
 pkgver=3.1
 pkgrel=2
 pkgdesc="State of the art machine learning library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://packages.debian.org/source/lenny/torch3"
 license=('GPL')
 depends=(gcc-libs)
diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD
index 1d6c27f91..d5c0cc2a2 100644
--- a/community/torcs/PKGBUILD
+++ b/community/torcs/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A 3D racing cars simulator using OpenGL"
 url="http://torcs.sourceforge.net"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'torcs-data'
 	 'libvorbis')
 makedepends=('plib')
diff --git a/community/transset-df/PKGBUILD b/community/transset-df/PKGBUILD
index f5d373fa3..6839abcf0 100644
--- a/community/transset-df/PKGBUILD
+++ b/community/transset-df/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=transset-df
 pkgver=6
 pkgrel=3
 pkgdesc="A patched version of X.Org's transset with added functionality."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://forchheimer.se/transset-df/'
 license=('GPL')
 depends=('libxcomposite' 'libxdamage' 'libxrender')
diff --git a/community/trayion/PKGBUILD b/community/trayion/PKGBUILD
index 693b2095c..365b18a9d 100644
--- a/community/trayion/PKGBUILD
+++ b/community/trayion/PKGBUILD
@@ -3,7 +3,7 @@ pkgver="0.1.2"
 pkgrel=1
 pkgdesc="FreeDesktop trayicon area for Ion3"
 url="http://code.google.com/p/trayion"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libx11')
 makedepends=('make')
diff --git a/community/tre/PKGBUILD b/community/tre/PKGBUILD
index b54263570..0e7ab68e5 100644
--- a/community/tre/PKGBUILD
+++ b/community/tre/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=tre
 pkgver=0.8.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="POSIX compliant regexp matching library. Includes agrep for aproximate grepping."
 url="http://laurikari.net/tre"
 depends=('glibc')
diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
index f53fbc46f..81f0e46a4 100644
--- a/community/tremulous/PKGBUILD
+++ b/community/tremulous/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.1.0
 pkgrel=9
 pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates."
 url="http://tremulous.net"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2")
 makedepends=(mesa)
diff --git a/community/trickle/PKGBUILD b/community/trickle/PKGBUILD
index 5b9844932..5560361cd 100644
--- a/community/trickle/PKGBUILD
+++ b/community/trickle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=trickle
 pkgver=1.07
 pkgrel=5
 pkgdesc="Trickle - lightweight userspace bandwidth shaper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://monkey.org/~marius/trickle"
 license=('BSD')
 depends=("libevent")
diff --git a/community/tucan/PKGBUILD b/community/tucan/PKGBUILD
index 5dd2d1a95..8f4f3c81d 100644
--- a/community/tucan/PKGBUILD
+++ b/community/tucan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tucan
 pkgver=0.3.10
 pkgrel=1
 pkgdesc='Download and upload manager for hosting sites'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tucaneando.com/index.html'
 license=('GPL3')
 depends=('python-imaging' 'python2' 'pygtk' 'tesseract' 'librsvg')
diff --git a/community/tuxcards/PKGBUILD b/community/tuxcards/PKGBUILD
index 929269c6e..2be7171be 100644
--- a/community/tuxcards/PKGBUILD
+++ b/community/tuxcards/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tuxcards
 pkgver=2.2.1
 pkgrel=1
 pkgdesc="A hierarchical notebook to enter and manage notes and ideas in a structured manner"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tuxcards.de"
 license=('GPL')
 depends=('qt')
diff --git a/community/tuxcmd-modules/PKGBUILD b/community/tuxcmd-modules/PKGBUILD
index ea811c041..e9cffb4cf 100644
--- a/community/tuxcmd-modules/PKGBUILD
+++ b/community/tuxcmd-modules/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=tuxcmd-modules
 pkgver=0.6.70
 pkgrel=1
 pkgdesc='Modules for Tux Commander'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tuxcmd.sourceforge.net/'
 license=('GPL')
 depends=('tuxcmd')
diff --git a/community/tuxcmd/PKGBUILD b/community/tuxcmd/PKGBUILD
index 488cddc44..4bb779b52 100644
--- a/community/tuxcmd/PKGBUILD
+++ b/community/tuxcmd/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=tuxcmd
 pkgver=0.6.70
 pkgrel=3
 pkgdesc='A GTK2 file manager with two panels'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tuxcmd.sourceforge.net/'
 license=('GPL')
 depends=('gtk2')
diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD
index c5f297b2c..feb55fae9 100644
--- a/community/tuxguitar/PKGBUILD
+++ b/community/tuxguitar/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2
 pkgrel=4
 _jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #url="http://www.herac.com.ar/contenidos/tuxguitar.html"
 url="http://sourceforge.net/projects/tuxguitar"
 license=('LGPL')
diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 782eb0534..ec083254d 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tuxpaint
 pkgver=0.9.21
 pkgrel=4
 pkgdesc="Tux Paint is a free drawing program designed for young children."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tuxpaint.org"
 license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
diff --git a/community/tvision/PKGBUILD b/community/tvision/PKGBUILD
index a07df4e45..0b89dcc1d 100644
--- a/community/tvision/PKGBUILD
+++ b/community/tvision/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tvision
 pkgver=2.2.1_r1
 pkgrel=2
 pkgdesc="turbo vision library port (console interface)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://tvision.sourceforge.net"
 license=("GPL")
 depends=(gpm gcc-libs libxmu)
diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD
index 59a5792c6..e54707192 100644
--- a/community/tvtime/PKGBUILD
+++ b/community/tvtime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tvtime
 pkgver=1.0.2
 pkgrel=2
 pkgdesc="A high quality television application for use with video capture cards"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tvtime.sourceforge.net/'
 license=('GPL' 'LGPL')
 depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv'
diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD
index 9ec06bf34..03aa1ae09 100644
--- a/community/twin/PKGBUILD
+++ b/community/twin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=twin
 pkgver=0.6.2
 pkgrel=1
 pkgdesc="A text-mode window environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linuz.sns.it/~max/twin/"
 license=('GPL' 'LGPL')
 depends=('ncurses' 'gpm' 'zlib' 'libtool' 'libxpm')
diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD
index 5d64f1bc1..e35b2fd7c 100644
--- a/community/twinkle/PKGBUILD
+++ b/community/twinkle/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=twinkle
 pkgver=1.4.2
 pkgrel=13
 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twinklephone.com/"
 license=('GPL')
 depends=('file' 'speex' 'boost-libs' 'libsndfile' 'commoncpp2' 'libxml2' 'libx11'
diff --git a/community/typespeed/PKGBUILD b/community/typespeed/PKGBUILD
index 8c574c877..461714d7a 100644
--- a/community/typespeed/PKGBUILD
+++ b/community/typespeed/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=typespeed
 pkgver=0.6.5
 pkgrel=3
 pkgdesc="Test your typing speed, and get your fingers' CPS."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://typespeed.sourceforge.net"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/ucl/PKGBUILD b/community/ucl/PKGBUILD
index 144d9c476..0ac1bb6e1 100644
--- a/community/ucl/PKGBUILD
+++ b/community/ucl/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ucl
 pkgver=1.03
 pkgrel=4
 pkgdesc="Portable lossless data compression library written in ANSI C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.oberhumer.com/opensource/ucl/"
 options=(!libtool)
diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD
index 914052e4b..f30a0faf0 100644
--- a/community/ude/PKGBUILD
+++ b/community/ude/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ude
 pkgver=0.2.10a
 pkgrel=2
 pkgdesc="Unix Desktop Environment is a GUI desktop environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libjpeg' 'libxmu' 'libxpm')
 url="http://udeproject.sourceforge.net/index.shtml"
diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD
index b1d7240a4..782e4fd24 100644
--- a/community/udunits/PKGBUILD
+++ b/community/udunits/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=udunits
 pkgver=2.1.22
 pkgrel=2
 pkgdesc='A tool for calculations of physical quantities'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.unidata.ucar.edu/software/udunits/'
 license=('custom')
 options=('!libtool')
diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD
index 98c88e7a7..72f8e8ab4 100644
--- a/community/ultimate-ircd/PKGBUILD
+++ b/community/ultimate-ircd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ultimate-ircd
 pkgver=3.0.2
 pkgrel=3
 pkgdesc="ultimate irc server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.shadow-realm.org/"
 license=("GPL")
 depends=(glibc)
diff --git a/community/uml_utilities/PKGBUILD b/community/uml_utilities/PKGBUILD
index b0fc5a633..46c03ecb7 100644
--- a/community/uml_utilities/PKGBUILD
+++ b/community/uml_utilities/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uml_utilities
 pkgver=20070815
 pkgrel=4
 pkgdesc="User Mode Linux Utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('fuse' 'readline' 'perl')
 url="http://user-mode-linux.sourceforge.net/"
 source=(http://user-mode-linux.sourceforge.net/${pkgname}_${pkgver}.tar.bz2)
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 8f0ff6668..9e866e24e 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=unbound
 pkgver=1.4.14
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://unbound.net/'
 license=('custom:BSD')
 options=('!libtool')
diff --git a/community/unclutter/PKGBUILD b/community/unclutter/PKGBUILD
index fc8f40d7b..aad154b49 100644
--- a/community/unclutter/PKGBUILD
+++ b/community/unclutter/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=8
 pkgrel=6
 pkgdesc="A small program for hiding the mouse cursor"
 url="http://ftp.x.org/contrib/utilities/unclutter-8.README"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('Public Domain')
 depends=('libxext')
 makedepends=('imake')
diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD
index 2196cd9aa..f5e1eccb3 100644
--- a/community/uniconvertor/PKGBUILD
+++ b/community/uniconvertor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uniconvertor
 pkgver=1.1.5
 pkgrel=3
 pkgdesc="A universal vector graphics translator using sK1 engine."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sk1project.org/modules.php?name=Products&product=uniconvertor"
 license=('GPL')
 depends=('python2' 'pil' 'python-reportlab' 'sk1libs')
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index b25062afc..cdb7ee936 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unifdef
 pkgver=2.6
 pkgrel=1
 pkgdesc="Remove #ifdef'ed lines"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://dotat.at/prog/unifdef/"
 license=('GPL')
 depends=()
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 7cfab5582..ad4c43b11 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=units
 pkgver=1.88
 pkgrel=2
 pkgdesc="converts between different units"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/units/units.html"
 depends=('readline')
 license=("GPL")
diff --git a/community/unpaper/PKGBUILD b/community/unpaper/PKGBUILD
index 0a854130e..52b0a52ed 100644
--- a/community/unpaper/PKGBUILD
+++ b/community/unpaper/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=unpaper
 pkgver=0.3
 pkgrel=2
 pkgdesc="post-processing tool for scanned sheets of paper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://$pkgname.berlios.de/"
 license="GPL"
 depends=()
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index 6e0d58232..41de79973 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=unrealircd
 pkgver=3.2.9
 pkgrel=2
 pkgdesc="Open Source IRC Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://unrealircd.com"
 license=('GPL2')
 depends=('openssl' 'curl' 'c-ares')
diff --git a/community/unrtf/PKGBUILD b/community/unrtf/PKGBUILD
index 1b3950de9..bce1f2817 100644
--- a/community/unrtf/PKGBUILD
+++ b/community/unrtf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=unrtf
 pkgver=0.21.2
 pkgrel=1
 pkgdesc="Command-line program which converts RTF documents to other formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/unrtf/unrtf.html"
 license=('GPL3')
 depends=('glibc')
diff --git a/community/unshield/PKGBUILD b/community/unshield/PKGBUILD
index 99cb13787..38cf6894b 100644
--- a/community/unshield/PKGBUILD
+++ b/community/unshield/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unshield
 pkgver=0.6
 pkgrel=2
 pkgdesc="Extracts CAB files from InstallShield installers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/synce/files/"
 license=('custom')
 depends=('zlib')
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index c157e645c..44bd457cd 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=uptimed
 pkgver=0.3.16
 pkgrel=3
 pkgdesc="A system uptime record daemon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://podgorny.cz/uptimed/"
 license=('GPL')
 depends=('glibc' 'bash')
diff --git a/community/upx/PKGBUILD b/community/upx/PKGBUILD
index b6242a652..e50838122 100644
--- a/community/upx/PKGBUILD
+++ b/community/upx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=upx
 pkgver=3.08
 pkgrel=1
 pkgdesc='Ultimate executable compressor.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://upx.sourceforge.net/'
 license=('GPL')
 depends=('zlib')
diff --git a/community/uqm/PKGBUILD b/community/uqm/PKGBUILD
index 4d82315d6..d88533b02 100644
--- a/community/uqm/PKGBUILD
+++ b/community/uqm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=uqm
 pkgver=0.7.0
 pkgrel=1
 pkgdesc="The Ur-Quan Masters is a port of Star Control 2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sc2.sf.net/"
 license=('GPL')
 depends=('libmikmod' 'libvorbis' 'sdl_image' 'libgl')
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index a029909b8..68b048614 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.2.1
 pkgrel=1
 _pkgdata=20111023
 pkgdesc="Activating switchable USB devices on Linux."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.draisberghof.de/usb_modeswitch/"
 license=('GPL')
 depends=('libusb-compat' 'tcl')
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index 775ee1112..522bd1b1f 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=16
 pkgdesc="A free UPnP A/V Media Server for Linux"
 url="http://ushare.geexbox.org"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libupnp' 'libdlna' 'sudo')
 backup=('etc/ushare/ushare.conf'
 	'etc/conf.d/ushare')
diff --git a/community/ussp-push/PKGBUILD b/community/ussp-push/PKGBUILD
index 673cb4718..709e347c3 100644
--- a/community/ussp-push/PKGBUILD
+++ b/community/ussp-push/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ussp-push
 pkgver=0.11
 pkgrel=3
 pkgdesc="OBEX object pusher for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xmailserver.org/ussp-push.html"
 depends=('openobex')
diff --git a/community/ustr/PKGBUILD b/community/ustr/PKGBUILD
index 9525962a1..721e23528 100644
--- a/community/ustr/PKGBUILD
+++ b/community/ustr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ustr
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="micro string API for C"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.and.org/ustr/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD
index 065fee173..85ad36a75 100644
--- a/community/uucp/PKGBUILD
+++ b/community/uucp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uucp
 pkgver=1.07
 pkgrel=3
 pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/uucp/uucp.html"
 license=('GPL')
 makedepends=('wget' 'sed' 'grep')
diff --git a/community/uudeview/PKGBUILD b/community/uudeview/PKGBUILD
index 3a81c0c45..43cbc0d35 100644
--- a/community/uudeview/PKGBUILD
+++ b/community/uudeview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uudeview
 pkgver=0.5.20
 pkgrel=9
 pkgdesc="UUDeview helps transmitting & recieving binary files using mail or newsgroups. Includes library files."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fpx.de/fp/Software/UUDeview/"
 license=('GPL')
 optdepends=('tk: for GUI')
diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD
index 9ee2129c6..2ddcbe37c 100644
--- a/community/uzbl/PKGBUILD
+++ b/community/uzbl/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=uzbl
 pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
 pkgver=2011.11.28
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.uzbl.org"
 license=('GPL3')
 makedepends=('pkgconfig' 'libwebkit>=1.3.13')
diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD
index 514cdcca2..2d9812429 100644
--- a/community/v8/PKGBUILD
+++ b/community/v8/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=v8
 pkgver=3.6.6.14
 pkgrel=1
 pkgdesc='A fast and modern javascript engine'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/v8'
 license=('BSD')
 depends=('gcc-libs')
diff --git a/community/vamps/PKGBUILD b/community/vamps/PKGBUILD
index a5dd6a799..a0be01624 100644
--- a/community/vamps/PKGBUILD
+++ b/community/vamps/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vamps
 pkgver=0.99.2
 pkgrel=8
 pkgdesc='Very fast requantisizing tool for backup DVDs'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://vamps.sourceforge.net'
 license=('GPL2')
 depends=('libdvdread')
diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD
index 1eb2b244c..d39993d3b 100644
--- a/community/vbetool/PKGBUILD
+++ b/community/vbetool/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=2
 pkgdesc="Uses lrmi in order to run code from the video BIOS"
 url="http://www.srcf.ucam.org/~mjg59/vbetool/"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib' 'libx86')
 makedepends=('pciutils')
 source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/vbindiff/PKGBUILD b/community/vbindiff/PKGBUILD
index 12a64d771..2b89cbe94 100644
--- a/community/vbindiff/PKGBUILD
+++ b/community/vbindiff/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vbindiff
 pkgver=3.0_beta4
 pkgrel=2
 pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the differences between them"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cjmweb.net/vbindiff/"
 license=('GPL')
 depends=('gcc-libs' 'ncurses')
diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD
index 07bf63bfd..c5facfb67 100644
--- a/community/vdrift/PKGBUILD
+++ b/community/vdrift/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vdrift
 pkgver=2011.10.22
 pkgrel=3
 pkgdesc="An open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://vdrift.net/"
 license=('GPL')
 depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 6a6681d09..d3a518972 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -8,7 +8,7 @@ _extramodules=extramodules-3.2-ARCH
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 pkgrel=3
 pkgdesc="Kernel module that emulates SCSI devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
 depends=('linux>=3.2' 'linux<3.3')
diff --git a/community/viewnior/PKGBUILD b/community/viewnior/PKGBUILD
index d53a3a382..5c2cc31ed 100644
--- a/community/viewnior/PKGBUILD
+++ b/community/viewnior/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=viewnior
 pkgver=1.1
 pkgrel=1
 pkgdesc="A simple, fast and elegant image viewer program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xsisqox.github.com/Viewnior/"
 license=('GPL3')
 depends=('gtk2>=2.12')
diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD
index 88e0f1498..8555fe568 100644
--- a/community/vifm/PKGBUILD
+++ b/community/vifm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vifm
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="Ncurses based file manager with vi like keybindings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://vifm.sourceforge.net/"
 license=('GPL')
 depends=('ncurses' 'gtk2')
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index ce38ac15e..3fad1772e 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=viking
 pkgver=1.2.2
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://viking.sourceforge.net/"
 license=('GPL2')
 depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme')
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 3d0b1e83a..19945365c 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vile
 pkgver=9.8
 pkgrel=1
 pkgdesc="vi like emacs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/vile/vile.html"
 depends=('ncurses')
 license=('custom')
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 7339633aa..be15a5682 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -16,8 +16,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
 
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
+_extramodules=extramodules-3.1-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 6abbad324..4ea807b62 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="A lightweight interface for interacting with the graphical display of v
 depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
 makedepends=('intltool')
 url="http://virt-manager.et.redhat.com"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
 md5sums=('1cc86ed3fbbe37a56faa6476b2e6dbcd')
diff --git a/community/visitors/PKGBUILD b/community/visitors/PKGBUILD
index 797fddbbe..e1e099c60 100644
--- a/community/visitors/PKGBUILD
+++ b/community/visitors/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=visitors
 pkgver=0.7
 pkgrel=2
 pkgdesc='A very fast web log analyzer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hping.org/visitors/"
 license=('GPL2' 'custom')
 depends=('glibc')
diff --git a/community/vlock/PKGBUILD b/community/vlock/PKGBUILD
index 0e79a7875..7beb1f60e 100644
--- a/community/vlock/PKGBUILD
+++ b/community/vlock/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.2.3
 pkgrel=1
 pkgdesc="A small console locking program"
 url="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('pam')
 install=vlock.install
diff --git a/community/vmoviedb/PKGBUILD b/community/vmoviedb/PKGBUILD
index 59466e33a..8b1b223de 100644
--- a/community/vmoviedb/PKGBUILD
+++ b/community/vmoviedb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vmoviedb
 pkgver=0.1.5
 pkgrel=4
 pkgdesc="A movie collection manager for the Gnome desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://vmoviedb.sourceforge.net"
 license=('GPL')
 depends=('libgnomeui' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD
index 310adf3a1..341ff0199 100644
--- a/community/vnstat/PKGBUILD
+++ b/community/vnstat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vnstat
 pkgver=1.11
 pkgrel=2
 pkgdesc="A console-based network traffic monitor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://humdi.net/vnstat/"
 license=('GPL')
 depends=('bash')
diff --git a/community/vobcopy/PKGBUILD b/community/vobcopy/PKGBUILD
index 1bffd0fad..77119e34d 100644
--- a/community/vobcopy/PKGBUILD
+++ b/community/vobcopy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vobcopy
 pkgver=1.2.0
 pkgrel=3
 pkgdesc="Copies DVD .vob files to harddisk, decrypting them on the way"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vobcopy.org"
 license=('GPL2')
 depends=('libdvdread>=4.1.3' 'libdvdcss')
diff --git a/community/vorbisgain/PKGBUILD b/community/vorbisgain/PKGBUILD
index 395187354..7c5bc547b 100644
--- a/community/vorbisgain/PKGBUILD
+++ b/community/vorbisgain/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vorbisgain
 pkgver=0.37
 pkgrel=2
 pkgdesc="A utility that computes the ReplayGain values for Ogg Vorbis files."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sjeng.org/vorbisgain.html"
 license=('GPL')
 depends=('libvorbis')
diff --git a/community/vorbissimple/PKGBUILD b/community/vorbissimple/PKGBUILD
index 8b9284370..8e7970931 100644
--- a/community/vorbissimple/PKGBUILD
+++ b/community/vorbissimple/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vorbissimple
 pkgver=0.0.2
 pkgrel=2
 pkgdesc="A Vorbis decoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kamaelia.sourceforge.net"
 license=('GPL')
 options=('!libtool')
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 78af11f86..40d3a2a99 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=vtk
 pkgver=5.8.0
 pkgrel=7
 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')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.vtk.org'
 license=('BSD')
 depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 73710b116..4af6ea712 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vym
 pkgver=2.0.3
 pkgrel=1
 pkgdesc="A mindmapping tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.insilmaril.de/vym/"
 license=('GPL')
 depends=('qt' 'unzip' 'zip')
diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD
index 8bffed66f..e88e9f19f 100644
--- a/community/vyqchat/PKGBUILD
+++ b/community/vyqchat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vyqchat
 pkgver=0.2.8
 pkgrel=3
 pkgdesc="vypress compatible qt chat (can work without server)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linux.bydg.org/~yogin/"
 license=('GPL')
 depends=('qt3' 'libao' 'libxi')
diff --git a/community/w3cam/PKGBUILD b/community/w3cam/PKGBUILD
index 5d85e2d99..59d6aa56d 100644
--- a/community/w3cam/PKGBUILD
+++ b/community/w3cam/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=w3cam
 pkgver=0.7.2
 pkgrel=9
 pkgdesc="a small and fast CGI program to retrieve images from a video4linux device."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mpx.freeshell.net/"
 license=('GPL')
 depends=('libpng' 'libjpeg')
diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD
index 473e98ef7..3fd4f09a0 100644
--- a/community/warmux/PKGBUILD
+++ b/community/warmux/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=warmux
 pkgver=11.04.1
 pkgrel=3
 pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD
index 2c941c653..b0384e132 100644
--- a/community/warsow/PKGBUILD
+++ b/community/warsow/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=2
 pkgdesc="a free online multiplayer competitive FPS based on the Qfusion engine"
 url="http://www.warsow.net/"
 license=('GPL')
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'mips64el') 
 depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data')
 makedepends=('mesa' 'openal' 'unzip')
 optdepends=('openal: for openal audio support')
diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD
index 334c92f3e..ea04d4520 100644
--- a/community/warzone2100/PKGBUILD
+++ b/community/warzone2100/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.3.9
 pkgrel=1
 pkgdesc="3D realtime strategy game on a future Earth"
 url="http://wz2100.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
 makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'mesa')
diff --git a/community/wavegain/PKGBUILD b/community/wavegain/PKGBUILD
index 6962ab2e5..ae2379453 100644
--- a/community/wavegain/PKGBUILD
+++ b/community/wavegain/PKGBUILD
@@ -7,7 +7,7 @@ _realname=WaveGain
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="A command line tool to normalize sound files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rarewares.org/others.php"
 license=('LGPL')
 depends=('libsndfile')
diff --git a/community/wbar/PKGBUILD b/community/wbar/PKGBUILD
index ffed2afe7..8968b1045 100644
--- a/community/wbar/PKGBUILD
+++ b/community/wbar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wbar
 pkgver=2.2.2
 pkgrel=1
 pkgdesc="A quick launch bar developed with speed in mind"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/wbar"
 license=('GPL')
 depends=('libglade' 'imlib2' 'gcc-libs')
diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD
index 26775681b..0f1b7b9c1 100644
--- a/community/wdm/PKGBUILD
+++ b/community/wdm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wdm
 pkgver=1.28
 pkgrel=5
 pkgdesc="An replacement X window display manager similar to, and based on XDM"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('windowmaker' 'pam' 'bash' 'libxmu')
 license=('GPL')
 source=(http://voins.program.ru/$pkgname/$pkgname-$pkgver.tar.bz2)
diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD
index c114dd27e..0b9cf4994 100644
--- a/community/webfs/PKGBUILD
+++ b/community/webfs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=webfs
 pkgver=1.21
 pkgrel=5
 pkgdesc="Simple http server for mostly static content."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://linux.bytesex.org/misc/webfs.html"
 license=("GPL")
 depends=('openssl')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 4d207a5a6..b06dbf980 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=16
 _realver=build16
 pkgrel=4
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD
index 80237ed83..e98718ad4 100644
--- a/community/windowlab/PKGBUILD
+++ b/community/windowlab/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=windowlab
 pkgver=1.40
 pkgrel=1
 pkgdesc="A small and simple window manager."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nickgravgaard.com/windowlab"
 license=('GPL')
 depends=('xorg-server' 'libxft')
diff --git a/community/winefish/PKGBUILD b/community/winefish/PKGBUILD
index a2fb79c8c..9ffbc3db8 100644
--- a/community/winefish/PKGBUILD
+++ b/community/winefish/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.3.3
 pkgrel=10
 pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting"
 url="http://winefish.berlios.de/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk2' 'desktop-file-utils' 'shared-mime-info')
 makedepends=('pkgconfig')
diff --git a/community/winegame/PKGBUILD b/community/winegame/PKGBUILD
index e38cd9255..7555b9814 100644
--- a/community/winegame/PKGBUILD
+++ b/community/winegame/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=winegame
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="An interface to install windows programs in Wine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/winegame/"
 license=('GPL3')
 depends=('libnotify' 'winestuff')
diff --git a/community/winestuff/PKGBUILD b/community/winestuff/PKGBUILD
index 0a1e18ea3..1e0b25b0d 100644
--- a/community/winestuff/PKGBUILD
+++ b/community/winestuff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=winestuff
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Library utility for winegame"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/winegame/"
 license=('LGPL2.1')
 depends=('qt' 'fuseiso' 'winetricks')
diff --git a/community/wkhtmltopdf/PKGBUILD b/community/wkhtmltopdf/PKGBUILD
index 14c05a4e8..92f24f434 100644
--- a/community/wkhtmltopdf/PKGBUILD
+++ b/community/wkhtmltopdf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wkhtmltopdf
 pkgver=0.9.9
 pkgrel=2
 pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/wkhtmltopdf/"
 license=('GPL3')
 depends=('qtwebkit')
diff --git a/community/wmctrl/PKGBUILD b/community/wmctrl/PKGBUILD
index 92cb2c484..a4a8a9af6 100644
--- a/community/wmctrl/PKGBUILD
+++ b/community/wmctrl/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.07
 pkgrel=3
 pkgdesc="Control your EWMH compliant window manager from command line"
 url="http://sweb.cz/tripie/utils/wmctrl/"
-arch=('i686' 'x86_64')
+arch=('i686' 'mips64el')
 license=('GPL')
 depends=(libxmu glib2)
 source=(http://sweb.cz/tripie/utils/wmctrl/dist/$pkgname-$pkgver.tar.gz
@@ -27,4 +27,3 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make prefix="$pkgdir/usr" install
 }
-
diff --git a/community/wmii/PKGBUILD b/community/wmii/PKGBUILD
index a411b5048..8413e3e5d 100644
--- a/community/wmii/PKGBUILD
+++ b/community/wmii/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wmii
 pkgver=3.9.2
 pkgrel=2
 pkgdesc="A small, dynamic window manager for X11"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'mips64el') 
 license=('MIT')
 url="http://wmii.suckless.org/"
 depends=('libxft' 'libxrandr' 'libxinerama' 'dash')
diff --git a/community/wmname/PKGBUILD b/community/wmname/PKGBUILD
index e9c75101e..0d72d64c7 100644
--- a/community/wmname/PKGBUILD
+++ b/community/wmname/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="An utility to set the name of your window manager"
 url="http://www.suckless.org/programs/wmname.html"
 license=('custom')
 depends=('libx11')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://dl.suckless.org/tools/wmname-$pkgver.tar.gz")
 md5sums=('6903d299f84d335e529fbd2c1d6e49fe')
 
diff --git a/community/wol/PKGBUILD b/community/wol/PKGBUILD
index 1920390a7..b5d778ac6 100644
--- a/community/wol/PKGBUILD
+++ b/community/wol/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=wol
 pkgver=0.7.1
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant"
 license=("GPL")
 depends=()
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index 916d2b25f..3393fd535 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=workrave
 pkgver=1.9.4
 pkgrel=2
 pkgdesc="a tool to help RSI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://workrave.org"
 depends=('libxtst' 'gtkmm' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice')
diff --git a/community/wput/PKGBUILD b/community/wput/PKGBUILD
index e6fbbfd61..1b0ddcaea 100644
--- a/community/wput/PKGBUILD
+++ b/community/wput/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wput
 pkgver=0.6.2
 pkgrel=1
 pkgdesc="A command line tool to upload files to FTP site, the opposite to wget"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wput.sourceforge.net/"
 depends=('gnutls>=2.4.1')
 license=('GPL')
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index ca45661be..04b748d41 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wt
 pkgver=3.2.0
 pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs>=1.36')
diff --git a/community/wvdial/PKGBUILD b/community/wvdial/PKGBUILD
index 8edab9e52..a6428f314 100644
--- a/community/wvdial/PKGBUILD
+++ b/community/wvdial/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.61
 pkgrel=3
 pkgdesc="A dialer program to connect to the Internet"
 url="http://alumnit.ca/wiki/index.php?page=WvDial"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('wvstreams' 'ppp' 'gcc-libs')
 makedepends=('lockdev')
diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD
index fb668c1d2..d6d506855 100644
--- a/community/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wvstreams
 pkgver=4.6.1
 pkgrel=3
 pkgdesc="A network programming library written in C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alumnit.ca/wiki/?page=WvStreams"
 license=('LGPL')
 depends=('zlib' 'pam' 'xplc' 'openssl' 'readline')
diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD
index 81973859a..30e04b55f 100644
--- a/community/wyrd/PKGBUILD
+++ b/community/wyrd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wyrd
 pkgver=1.4.5
 pkgrel=3
 pkgdesc='A text-based front-end to Remind.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pessimization.com/software/wyrd/'
 license=('GPL')
 depends=('remind' 'ncurses')
diff --git a/community/xalan-c/PKGBUILD b/community/xalan-c/PKGBUILD
index c73848fca..e013f6b97 100644
--- a/community/xalan-c/PKGBUILD
+++ b/community/xalan-c/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xalan-c
 pkgver=1.11_pre1153059
 pkgrel=1
 pkgdesc="A XSLT processor for transforming XML documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xml.apache.org/xalan-c"
 license=('APACHE')
 depends=('xerces-c')
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index c392ff4ba..d21f4e205 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xapian-core
 pkgver=1.2.8
 pkgrel=1
 pkgdesc='Open source search engine library.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.xapian.org/'
 license=('GPL')
 depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
diff --git a/community/xautolock/PKGBUILD b/community/xautolock/PKGBUILD
index a2b394e59..72a6ac9d7 100644
--- a/community/xautolock/PKGBUILD
+++ b/community/xautolock/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xautolock
 pkgver=2.2
 pkgrel=2
 pkgdesc="An automatic X screen-locker/screen-saver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="ftp://ibiblio.org/pub/Linux/X11/screensavers/"
 license=('GPL2')
 depends=('libxss')
diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD
index 8e979b07a..913e7cd09 100644
--- a/community/xbindkeys/PKGBUILD
+++ b/community/xbindkeys/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xbindkeys
 pkgver=1.8.5
 pkgrel=1
 pkgdesc="Launch shell commands with your keyboard or your mouse under X"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 license=('GPL')
 depends=('libx11' 'guile' 'tk')
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index e44b8e29e..e060ead17 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xboard
 pkgver=4.5.2
 pkgrel=1
 pkgdesc="A graphical user interfaces for chess"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/xboard/"
 license=('GPL3')
 depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils')
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 14cb84c31..1cf9b6a4d 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xcircuit
 pkgver=3.7.26
 pkgrel=1
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://opencircuitdesign.com/xcircuit"
 license=('GPL2')
 depends=('tk' 'libxpm' 'zlib')
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 749bcebd6..8c924de9b 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xdebug
 pkgver=2.1.2
 pkgrel=1
 pkgdesc="PHP debugging extension"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xdebug.org"
 license=('GPL')
 depends=('php')
diff --git a/community/xdg-user-dirs/PKGBUILD b/community/xdg-user-dirs/PKGBUILD
index 3c1fa8353..25dd339bf 100644
--- a/community/xdg-user-dirs/PKGBUILD
+++ b/community/xdg-user-dirs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xdg-user-dirs
 pkgver=0.14
 pkgrel=1
 pkgdesc="tool to help manage 'well known' user directories like the desktop folder and the music folder. It also handles localization (i.e. translation) of the filenames. "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('sh')
 makedepends=('gawk')
 url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
diff --git a/community/xdialog/PKGBUILD b/community/xdialog/PKGBUILD
index 750a99ff1..3716f5570 100644
--- a/community/xdialog/PKGBUILD
+++ b/community/xdialog/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.3.1
 pkgrel=5
 pkgdesc="A drop-in replacement for the 'dialog' or 'cdialog' programs"
 url="http://xdialog.dyns.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2')
 license=('GPL')
 source=("http://xdialog.free.fr/Xdialog-${pkgver}.tar.bz2"
diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD
index 0ff97363c..833ce7f9e 100644
--- a/community/xdiskusage/PKGBUILD
+++ b/community/xdiskusage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xdiskusage
 pkgver=1.48
 pkgrel=6
 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('fltk')
 makedepends=('libxi')
 license=('GPL')
diff --git a/community/xdotool/PKGBUILD b/community/xdotool/PKGBUILD
index 0ce58a37a..58913e176 100644
--- a/community/xdotool/PKGBUILD
+++ b/community/xdotool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xdotool
 pkgver=2.20110530.1
 pkgrel=1
 pkgdesc="Command-line X11 automation tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.semicomplete.com/projects/xdotool/"
 license=('BSD')
 depends=('libxtst' 'libxinerama')
diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD
index 4b9728fc0..7b5c8043b 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xemacs
 pkgver=21.5.31
 pkgrel=4
 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xemacs.org/"
 license=('GPL')
 depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
diff --git a/community/xerces-c/PKGBUILD b/community/xerces-c/PKGBUILD
index dc42d09e5..4dab38499 100644
--- a/community/xerces-c/PKGBUILD
+++ b/community/xerces-c/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xerces-c
 pkgver=3.1.1
 pkgrel=2
 pkgdesc="A validating XML parser written in a portable subset of C++."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xerces.apache.org/xerces-c"
 license=("APACHE")
 depends=('gcc-libs' 'curl')
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index 20ba88822..8788a2600 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfe
 pkgver=1.32.4
 pkgrel=1
 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://roland65.free.fr/xfe"
 license=("GPL")
 depends=('fox')
diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD
index 2d2176b93..d20e33369 100644
--- a/community/xfmedia/PKGBUILD
+++ b/community/xfmedia/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xfmedia
 pkgver=0.9.2
 pkgrel=10
 pkgdesc="xfce media player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://spuriousinterrupt.org/projects/xfmedia/"
 depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib')
diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD
index 1e6e80c69..cb3864be4 100755
--- a/community/xiphos/PKGBUILD
+++ b/community/xiphos/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xiphos
 pkgver=3.1.4
 pkgrel=9
 pkgdesc="Bible study tool for GTK+"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://xiphos.org/"
 license=('GPL')
 depends=('libgsf' 'libglade' 'gtkhtml' 'sword')
diff --git a/community/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD
index e6114985f..c292de3d6 100644
--- a/community/xkbsel/PKGBUILD
+++ b/community/xkbsel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xkbsel
 pkgver=0.13
 pkgrel=5
 pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.meduna.org/sw_xkbsel_en.html"
 license=('GPL')
 depends=('gdbm' 'libxaw')
diff --git a/community/xkeycaps/PKGBUILD b/community/xkeycaps/PKGBUILD
index 1fade9a45..ef84d353b 100644
--- a/community/xkeycaps/PKGBUILD
+++ b/community/xkeycaps/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=xkeycaps
 pkgver=2.46
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="XKeyCaps is a graphical front-end to xmodmap."
 url="http://www.jwz.org/xkeycaps/"
 license=('custom')
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index c9a0ceed5..9a0bcbfc5 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xl2tpd
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xelerance.com"
 license=('GPL')
 depends=('ppp')
diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD
index edff1665e..0d1cc9b3f 100644
--- a/community/xloadimage/PKGBUILD
+++ b/community/xloadimage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xloadimage
 pkgver=4.1
 pkgrel=11
 pkgdesc="An utility to view many different types of images under X11"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 #url="http://world.std.com/~jimf/xloadimage.html"
 url="http://sioseis.ucsd.edu/xloadimage.html"
 license=("MIT")
diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD
index d5104f53e..caeb1e018 100644
--- a/community/xlockmore/PKGBUILD
+++ b/community/xlockmore/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xlockmore
 pkgver=5.37
 pkgrel=1
 pkgdesc="screen saver / locker for the X Window System"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('BSD')
 depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu)
 url="http://www.tux.org/~bagleyd/xlockmore.html"
diff --git a/community/xmldiff/PKGBUILD b/community/xmldiff/PKGBUILD
index 167e91ec8..bff34a96d 100644
--- a/community/xmldiff/PKGBUILD
+++ b/community/xmldiff/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmldiff
 pkgver=0.6.10
 pkgrel=1
 pkgdesc="A python tool that figures out the differences between two similar XML files, in the same way the diff utility does it"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.logilab.org/project/xmldiff/"
 license=('GPL2')
 depends=('python2' 'libxslt' 'jade')
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index 66697bd6d..1e1eca0c1 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmlrpc-c
 pkgver=2222
 pkgrel=1
 pkgdesc='This library provides a modular implementation of XML-RPC for C and C++'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://xmlrpc-c.sourceforge.net/'
 license=('custom:xmlrpc-c')
 depends=('curl' 'libxml2' 'gcc-libs' 'zlib')
diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD
index 6e6fe309b..b07fd1af9 100644
--- a/community/xmms-imms/PKGBUILD
+++ b/community/xmms-imms/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmms-imms
 pkgver=3.1.0_rc8
 pkgrel=2
 pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=("GPL")
 url="http://imms.luminal.org/"
 depends=('xmms' 'pcre' 'sqlite3' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw')
diff --git a/community/xmms-pulse/PKGBUILD b/community/xmms-pulse/PKGBUILD
index 7d54aae91..7f97c4ced 100644
--- a/community/xmms-pulse/PKGBUILD
+++ b/community/xmms-pulse/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmms-pulse
 pkgver=0.9.4
 pkgrel=2
 pkgdesc="An XMMS output plugin for the PulseAudio sound server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/xmms-pulse"
 license=('GPL')
 depends=('xmms' 'pulseaudio')
diff --git a/community/xmms-volnorm/PKGBUILD b/community/xmms-volnorm/PKGBUILD
index 2d8003258..8b2f6b3f7 100644
--- a/community/xmms-volnorm/PKGBUILD
+++ b/community/xmms-volnorm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xmms-volnorm
 pkgver=0.8.3
 pkgrel=4
 pkgdesc="A XMMS plug-in to normalize the volume"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://volnorm.sourceforge.net/"
 license=('GPL')
 options=('!libtool')
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 56fff3d7b..b2d59a5e6 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xmms2
 pkgver=0.8DrO_o
 pkgrel=2
 pkgdesc="complete rewrite of the popular music player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmms2.org/"
 license=('LGPL')
 backup=('etc/conf.d/xmms2d.conf')
diff --git a/community/xmmsctrl/PKGBUILD b/community/xmmsctrl/PKGBUILD
index beb2c90f7..95cb17f60 100644
--- a/community/xmmsctrl/PKGBUILD
+++ b/community/xmmsctrl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xmmsctrl
 pkgver=1.9 
 pkgrel=2
 pkgdesc="An XMMS console control application" 
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.aau.dk/~adavid/utils/" 
 license=("GPL")
 depends=('xmms') 
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 43b2db0c9..9fa62dba5 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
 makedepends=('ghc>=7.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string'
 	     'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 59774e0dd..ee51d9f10 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmonad-contrib
 pkgver=0.10
 pkgrel=1
 pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
 depends=('ghc=7.0.3' 'xmonad=0.10' 'sh' 'haskell-x11=1.5.0.1'
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index fdf5a8987..0d015a40d 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmonad
 pkgver=0.10
 pkgrel=2
 pkgdesc="A lightweight X11 tiled window manager written in Haskell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
 depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 64a776beb..3f13d611e 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmoto
 pkgver=0.5.8
 pkgrel=1
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmoto.tuxfamily.org"
 license=('GPL')
 depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
diff --git a/community/xmove/PKGBUILD b/community/xmove/PKGBUILD
index cc7393078..3e923496d 100644
--- a/community/xmove/PKGBUILD
+++ b/community/xmove/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xmove
 pkgver=2.0beta2
 pkgrel=4
 pkgdesc="A tool to move X windows to different X servers, something like a GNU screen for X."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/archlinux-stuff/"
 license=('custom')
 depends=('libx11')
diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD
index b26a556c6..43cb3b476 100644
--- a/community/xnc/PKGBUILD
+++ b/community/xnc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xnc
 pkgver=5.0.4
 pkgrel=4
 pkgdesc="X nortern captain file manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xnc.jinr.ru/"
 license=('GPL')
 depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7')
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 092a0c83a..989a23021 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xnee
 pkgver=3.10
 pkgrel=1
 pkgdesc="A program to record, distribute, and replay X (X11) protocol data"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sandklef.com/xnee/"
 license=('GPL3')
 depends=('gtk2' 'libgnomeui' 'libxtst')
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index 675b532d9..42d8a1c85 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xosd
 pkgver=2.2.14
 pkgrel=5
 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL2')
 url="http://www.ignavus.net/software.html"
 depends=('libxt' 'libxinerama' 'sh')
diff --git a/community/xpacman/PKGBUILD b/community/xpacman/PKGBUILD
index ccefd846b..908a4c7b6 100644
--- a/community/xpacman/PKGBUILD
+++ b/community/xpacman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xpacman
 pkgver=0.11
 pkgrel=5
 pkgdesc="X pacman game (use z x / ' q keys)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.ibiblio.org/pub/X11/contrib/games/"
 license=('custom')
 depends=(libx11)
diff --git a/community/xpacman2/PKGBUILD b/community/xpacman2/PKGBUILD
index 93d4ad8ec..48034026b 100644
--- a/community/xpacman2/PKGBUILD
+++ b/community/xpacman2/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.002
 _xpkgver=1_002
 pkgrel=3
 pkgdesc="another X pacman game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.nvg.unit.no/pub/pacman/"
 license=('GPL')
 depends=(libx11 ncurses gcc-libs)
diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD
index 08fc0854f..338d5972d 100644
--- a/community/xpad/PKGBUILD
+++ b/community/xpad/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xpad
 pkgver=4.1
 pkgrel=1
 pkgdesc="Stickies-like notes program"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('gtk2' 'libsm' 'librsvg')
 makedepends=('intltool')
 url="http://mterry.name/xpad/"
diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD
index be1d39f2e..588fb55e5 100644
--- a/community/xplanet/PKGBUILD
+++ b/community/xplanet/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xplanet
 pkgver=1.2.2
 pkgrel=1
 pkgdesc="An Xearth wannabe"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xplanet.sourceforge.net/"
 license=('GPL')
 depends=('pango' 'libungif' 'libtiff' 'libxss')
diff --git a/community/xplc/PKGBUILD b/community/xplc/PKGBUILD
index bc029a87c..c7c5a7b5b 100644
--- a/community/xplc/PKGBUILD
+++ b/community/xplc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xplc
 pkgver=0.3.13
 pkgrel=3
 pkgdesc="Cross-Platform Lightweight Components"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xplc.sourceforge.net"
 license=('LGPL')
 depends=('gcc-libs')
diff --git a/community/xrestop/PKGBUILD b/community/xrestop/PKGBUILD
index 605520b7d..5820da5df 100644
--- a/community/xrestop/PKGBUILD
+++ b/community/xrestop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xrestop
 pkgver=0.4
 pkgrel=3
 pkgdesc="Uses the X-Resource extension to provide 'top' like statistics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freedesktop.org/wiki/Software/xrestop"
 license=('GPL')
 depends=('libxres' 'ncurses')
diff --git a/community/xsel/PKGBUILD b/community/xsel/PKGBUILD
index d1de1aed8..f3bcc8b08 100644
--- a/community/xsel/PKGBUILD
+++ b/community/xsel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xsel
 pkgver=1.2.0
 pkgrel=4
 pkgdesc="XSel is a command-line program for getting and setting the contents of the X selection"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.vergenet.net/~conrad/software/xsel/"
 license=("custom")
 depends=('libx11')
diff --git a/community/xsensors/PKGBUILD b/community/xsensors/PKGBUILD
index 16a329b5e..c061523d2 100644
--- a/community/xsensors/PKGBUILD
+++ b/community/xsensors/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xsensors
 pkgver=0.70
 pkgrel=3
 pkgdesc="X11 interface to lm_sensors"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxhardware.org/xsensors/"
 license=('GPL')
 depends=('gtk2' 'lm_sensors')
diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD
index fd84e061c..23786f30f 100644
--- a/community/xsettings-client/PKGBUILD
+++ b/community/xsettings-client/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xsettings-client
 pkgver=0.10
 pkgrel=5
 pkgdesc="Provides cross toolkit configuration settings such as theme parameters"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://matchbox-project.org"
 depends=('libx11')
diff --git a/community/xtmsplit/PKGBUILD b/community/xtmsplit/PKGBUILD
index 46bc8b101..2ca9375d9 100644
--- a/community/xtmsplit/PKGBUILD
+++ b/community/xtmsplit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xtmsplit
 pkgver=0.2
 pkgrel=2
 pkgdesc="Xtremsplit-compliant file splitter/merger"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.software.caelistis.be/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/xvidcap/PKGBUILD b/community/xvidcap/PKGBUILD
index 6d68a48a9..52f8f4622 100644
--- a/community/xvidcap/PKGBUILD
+++ b/community/xvidcap/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xvidcap
 pkgver=1.1.7
 pkgrel=4
 pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://xvidcap.sourceforge.net/"
 depends=('dbus-glib' 'lame' 'libxmu' 'libglade' 'ffmpeg' 'dbus')
diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD
index c06e2583a..76db0fc76 100644
--- a/community/xvkbd/PKGBUILD
+++ b/community/xvkbd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xvkbd
 pkgver=3.2
 pkgrel=2
 pkgdesc="virtual (graphical) keyboard program for X Window System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://homepage3.nifty.com/tsato/xvkbd/"
 license=('GPL')
 depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp')
diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD
index f504189bf..1a98e7f65 100644
--- a/community/xwax/PKGBUILD
+++ b/community/xwax/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xwax
 pkgver=1.0
 pkgrel=1
 pkgdesc='Open-source vinyl emulation software for Linux.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.xwax.co.uk/'
 license=('GPL')
 depends=('alsa-lib' 'sdl_ttf' 'ttf-dejavu')
diff --git a/community/xxkb/PKGBUILD b/community/xxkb/PKGBUILD
index 4bcf2b771..ee9bd7c19 100644
--- a/community/xxkb/PKGBUILD
+++ b/community/xxkb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xxkb
 pkgver=1.11
 pkgrel=4
 pkgdesc="keyboard layout switcher/indicator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/xxkb/"
 license=('PerlArtistic')
 depends=('libxpm')
diff --git a/community/xylib/PKGBUILD b/community/xylib/PKGBUILD
index ca6ba4e32..dc0c87ea1 100644
--- a/community/xylib/PKGBUILD
+++ b/community/xylib/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=xylib
 pkgver=0.8
 pkgrel=2
 pkgdesc='xylib is a portable C++ library for reading files that contain x-y data from powder diffraction, spectroscopy or other experimental methods.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.unipress.waw.pl/fityk/xylib/'
 license=('LGPL')
 makedepends=('boost')
diff --git a/community/yacpi/PKGBUILD b/community/yacpi/PKGBUILD
index 23f2c152a..7ead3986a 100644
--- a/community/yacpi/PKGBUILD
+++ b/community/yacpi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=yacpi
 pkgver=3.0.1
 pkgrel=2
 pkgdesc="ncurses-based acpi monitor."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ngolde.de/yacpi.html"
 license=('GPL')
 depends=(ncurses libacpi)
diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD
index 95c3b42c7..5b7944a45 100644
--- a/community/yagf/PKGBUILD
+++ b/community/yagf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=yagf
 pkgver=0.8.9
 pkgrel=1
 pkgdesc="QT4-based GUI for Cuneiform OCR"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://symmetrica.net/cuneiform-linux/yagf-en.html"
 license=('GPL')
 depends=('cuneiform' 'qt>=4.3' 'aspell')
diff --git a/community/yajl/PKGBUILD b/community/yajl/PKGBUILD
index 8eb588368..19aedc0be 100644
--- a/community/yajl/PKGBUILD
+++ b/community/yajl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yajl
 pkgver=2.0.4
 pkgrel=1
 pkgdesc='Yet Another JSON Library.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://lloyd.github.com/yajl/'
 license=('ISC')
 makedepends=('cmake')
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 977c56fb5..3474a3ae8 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=yaws
 pkgver=1.88
 pkgrel=3
 pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://yaws.hyber.org'
 license=('BSD')
 depends=('pam' 'erlang')
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 8d7eb135e..b71dd9630 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=yaz
 pkgver=4.2.24
 pkgrel=1
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://www.indexdata.dk/yaz"
 depends=('openssl' 'libxslt' 'icu')
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 6f7103183..5e36f3c18 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=zathura
 pkgver=0.0.8.5
 pkgrel=4
 pkgdesc="a PDF viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pwmt.org/projects/zathura/"
 license=('custom')
 depends=('poppler-glib' 'gtk2' 'cairo')
diff --git a/community/zaz/PKGBUILD b/community/zaz/PKGBUILD
index 8954f7386..2f08aef15 100644
--- a/community/zaz/PKGBUILD
+++ b/community/zaz/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zaz
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="Puzzle game where the player has to arrange balls in triplets."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/zaz/"
 license=('GPL3' 'custom:CCBYSA')
 depends=('ftgl' 'sdl' 'sdl_image' 'libvorbis' 'libtheora')
diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD
index 2d1a36b8a..3919fc161 100644
--- a/community/zeromq/PKGBUILD
+++ b/community/zeromq/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=zeromq
 pkgver=2.1.11
 pkgrel=1
 pkgdesc="Fast messaging system built on sockets, C and C++ bindings.  aka 0MQ, ZMQ."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.zeromq.org"
 license=('LGPL')
 depends=('gcc-libs' 'util-linux')
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index e0d99f4de..ab3c92e82 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='An IRC bouncer with modules & scripts support'
 url='http://en.znc.in/wiki/index.php/ZNC'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('c-ares' 'gcc-libs' 'openssl')
 makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl')
 optdepends=('tcl: modtcl module'
diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD
index e177e74f5..dd6ffd124 100644
--- a/core/acl/PKGBUILD
+++ b/core/acl/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=acl
 pkgver=2.2.51
 pkgrel=1
 pkgdesc="Access control list utilities, libraries and headers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/acl"
 license=('LGPL')
 depends=('attr>=2.4.46')
diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD
index 30f3ad81a..1df0d7b06 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=attr
 pkgver=2.4.46
 pkgrel=1
 pkgdesc="Extended attribute support library for ACL support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/attr"
 license=('LGPL')
 depends=('glibc') 
@@ -26,6 +26,7 @@ build() {
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+  export CFLAGS+="-Wparentheses"
 
   make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index e453bb84d..ac9aa8b6c 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -8,7 +8,7 @@ _patchlevel=020 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnu.org/software/bash/bash.html"
 groups=('base')
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 550c845f3..da5674bae 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.22
 pkgrel=4
 _date=20111227
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 groups=('base-devel')
@@ -34,6 +34,7 @@ build() {
   mkdir binutils-build && cd binutils-build
 
   [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
+  [[ $CARCH == "mips64el" ]] && CONFIGFLAG="--disable-multilib --disable-werror"
 
   ${srcdir}/binutils/configure --prefix=/usr \
     --enable-ld=default --enable-gold \
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index 90cf43059..b3a32e418 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bison
 pkgver=2.5
 pkgrel=3
 pkgdesc="The GNU general-purpose parser generator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/bison/bison.html"
 depends=('glibc' 'm4' 'sh')
diff --git a/core/bridge-utils/PKGBUILD b/core/bridge-utils/PKGBUILD
index fb452354e..774404d3b 100644
--- a/core/bridge-utils/PKGBUILD
+++ b/core/bridge-utils/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=bridge-utils
 pkgver=1.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Utilities for configuring the Linux ethernet bridge"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
 license=('GPL')
 depends=('glibc')
diff --git a/core/btrfs-progs-unstable/PKGBUILD b/core/btrfs-progs-unstable/PKGBUILD
index 61b4d52cb..12699158a 100644
--- a/core/btrfs-progs-unstable/PKGBUILD
+++ b/core/btrfs-progs-unstable/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=btrfs-progs-unstable
 pkgver=0.19.20101006
-pkgrel=2
+pkgrel=2.1
 pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('glibc' 'e2fsprogs')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
 url="http://btrfs.wiki.kernel.org/"
diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD
index 5381b848b..0f5a0ed6b 100644
--- a/core/bzip2/PKGBUILD
+++ b/core/bzip2/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=bzip2
 pkgver=1.0.6
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A high-quality data compression program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://sources.redhat.com/bzip2"
 groups=('base')
diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD
index b61a7a95c..9a3af5e84 100644
--- a/core/cloog/PKGBUILD
+++ b/core/cloog/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cloog
 pkgver=0.16.3
 pkgrel=1
 pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bastoul.net/cloog/"
 license=('GPL')
 depends=('isl' 'gmp')
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 18940add4..f825c5f29 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -6,7 +6,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/coreutils"
 groups=('base')
diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD
index d25d26ad6..8b0eec86c 100644
--- a/core/cracklib/PKGBUILD
+++ b/core/cracklib/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cracklib
 pkgver=2.8.18
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Password Checking Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://sourceforge.net/projects/cracklib"
 depends=('glibc' 'zlib')
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD
index f5264bb73..4e500aa23 100644
--- a/core/crda/PKGBUILD
+++ b/core/crda/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=crda
 pkgver=1.1.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Central Regulatory Domain Agent for wireless networks"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
 depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
-makedepends=('python-m2crypto')
+makedepends=('python-m2crypto' 'pkg-config')
 install=crda.install
 source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
         crda.rc)
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index 795884823..c23101c6f 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('pam' 'bash' 'run-parts')
 optdepends=('smtp-server: sending cron job output via email')
 
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 395318ac1..83f108937 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cryptsetup
 pkgver=1.4.1
 pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://code.google.com/p/cryptsetup/"
 groups=('base')
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index 6ce1c9c25..f8653faad 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=curl
 pkgver=7.24.0
 pkgrel=1
 pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index 3aeb4b3fe..b46979bc2 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dash
 pkgver=0.5.7
 pkgrel=2
 pkgdesc="A POSIX compliant shell that aims to be as small as possible"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gondor.apana.org.au/~herbert/dash/"
 license=('BSD')
 depends=('glibc')
diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index c86b2f44a..a9f751bca 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=db
 pkgver=5.3.15
 pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
 license=('custom')
 depends=('gcc-libs' 'sh')
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index 7c1b51286..854a17c40 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -4,10 +4,10 @@
 #
 pkgname=dbus-core
 pkgver=1.4.16
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'custom')
 depends=('expat>=2.0.1' 'coreutils' 'filesystem')
 makedepends=('libx11')
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 500de0241..75477bfeb 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=5.2.12
 pkgrel=4
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 groups=('base')
 depends=('glibc' 'sh')
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index abf51904c..77aa80bd8 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=dialog
 pkgver=1.1_20111020
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A tool to display dialog boxes from shell scripts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/dialog/"
 license=('LGPL2.1')
 depends=('ncurses')
diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD
index 44b02060d..ec0c05e0b 100644
--- a/core/diffutils/PKGBUILD
+++ b/core/diffutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=diffutils
 pkgver=3.2
 pkgrel=1
 pkgdesc="Utility programs used for creating patch files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/diffutils"
 license=('GPL3')
 groups=('base')
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 5af91a2ec..b15879ebf 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 conflicts=('mkinitcpio<0.7')
 depends=('device-mapper>=2.0.54')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
         http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2
diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index e01894138..4d698eaba 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -8,12 +8,12 @@ pkgname=dnsutils
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.8.1
 _pkgver=9.8.1
-pkgrel=2
+pkgrel=2.1
 
 pkgdesc='DNS utilities: dig host nslookup'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index d21e51aaf..3f7526340 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=e2fsprogs
 pkgver=1.41.14
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Ext2/3/4 filesystem utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'MIT')
 url="http://e2fsprogs.sourceforge.net"
 groups=('base')
diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD
index dac07e317..3babe36a6 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ed
 pkgver=1.6
 pkgrel=1
 pkgdesc="A POSIX-compliant line-oriented text editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnu.org/software/ed/ed.html"
 depends=('glibc' 'sh')
diff --git a/core/eglibc/PKGBUILD b/core/eglibc/PKGBUILD
new file mode 100644
index 000000000..87ea5dc27
--- /dev/null
+++ b/core/eglibc/PKGBUILD
@@ -0,0 +1,149 @@
+# $Id: PKGBUILD 116984 2011-03-27 06:35:25Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuilt with each new glibc version
+
+pkgname=eglibc
+pkgver=2.13
+pkgrel=1
+_glibcdate=20110117
+pkgdesc="GNU C Library"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=('linux-api-headers>=2.6.37' 'tzdata')
+makedepends=('gcc>=4.4')
+backup=(etc/locale.gen
+        etc/nscd.conf)
+options=('!strip')
+install=glibc.install
+source=(http://repo.parabolagnulinux.org/other/eglibc-2_13.tar.bz2
+        http://repo.parabolagnulinux.org/other/eglibc-linuxthreads-2_13.tar.bz2
+        http://repo.parabolagnulinux.org/other/eglibc-localedef-2_13.tar.bz2
+        http://repo.parabolagnulinux.org/other/eglibc-ports-2_13.tar.bz2
+        nscd
+        locale.gen.txt
+        locale-gen)
+
+build() {
+  cd ${srcdir}
+  ln -s eglibc-2_13 eglibc 
+
+  cd eglibc
+
+  # timezone data is in separate package (tzdata)
+  sed -i "s/localedata //" Makeconfig 
+
+  for addon in ports ; do
+    ln -s ../eglibc-$addon-2_13 $addon 
+  done
+
+  install -dm755 ${pkgdir}/etc
+  touch ${pkgdir}/etc/ld.so.conf
+
+  cd ${srcdir}
+  mkdir build || true
+  cd build
+
+  if [[ ${CARCH} = "mips64el" ]]; then
+    # mips64el is only supported out of tree.
+    extra_addons=",ports"
+  fi
+
+  echo "slibdir=/lib" >> configparms
+
+  ${srcdir}/eglibc/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --with-headers=/usr/include \
+      --enable-add-ons=nptl,libidn$extra_addons \
+      --enable-kernel=2.6.27 \
+      --with-tls --with-__thread \
+      --enable-bind-now --without-gd \
+      --without-cvs --disable-profile \
+      --disable-multi-arch
+        
+  make
+}
+
+check() {
+  cd ${srcdir}/build
+
+  # some errors are expected - manually check log files
+  make -k check || true
+}
+
+package() {
+  cd ${srcdir}/build
+  make install_root=${pkgdir} install
+
+  rm ${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}/eglibc/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}/eglibc/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}/eglibc/localedata/SUPPORTED
+  sed -i 's|\\| |g' ${srcdir}/eglibc/localedata/SUPPORTED
+  sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/eglibc/localedata/SUPPORTED
+  cat ${srcdir}/eglibc/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
+  
+  # manually strip files as stripping libpthread-*.so and libthread_db.so
+  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
+  # valgrind on x86_64
+
+  cd $pkgdir
+  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
+                        usr/bin/{gencat,getconf,getent,iconv,locale} \
+                        usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
+                        usr/lib/getconf/* \
+                        usr/sbin/{iconvconfig,nscd,rpcinfo}
+  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
+
+  strip $STRIP_STATIC usr/lib/*.a \
+                      lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+
+  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+                      lib/libnss_{compat,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,gconv/*.so}
+}
+md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
+         '483f37cfdd619e81d8ca9e9d713944b5'
+         '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
+         '40cd342e21f71f5e49e32622b25acc52'
+         'a3ac6f318d680347bb6e2805d42b73b2'
+         'b042647ea7d6f22ad319e12e796bd13e'
+         '24dfab6fd244f3773523412588ecc52c'
+         '7d0154b7e17ea218c9fa953599d24cc4'
+         'b587ee3a70c9b3713099295609afde49'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
+md5sums=('0f79580a194657aa74e3331d33a3889e'
+         'f07ce5e45308fc7e2faaa55f2c766550'
+         '40b693a9ce8ab0a8837826160b3419c9'
+         '973e16228492b46bf731ad5ce2e06e9f'
+         'b587ee3a70c9b3713099295609afde49'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/core/eglibc/glibc-2.13-prelink.patch b/core/eglibc/glibc-2.13-prelink.patch
new file mode 100644
index 000000000..bef7998a8
--- /dev/null
+++ b/core/eglibc/glibc-2.13-prelink.patch
@@ -0,0 +1,26 @@
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 9a560b3..201c9cf 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+      we need it in the memory handling later.  */
+   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+ 
++  /* Remember the last search directory added at startup, now that
++     malloc will no longer be the one from dl-minimal.c.  */
++  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
++
+   if (prelinked)
+     {
+       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
+@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ 			  lossage);
+     }
+ 
+-  /* Remember the last search directory added at startup, now that
+-     malloc will no longer be the one from dl-minimal.c.  */
+-  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+-
+   if (! prelinked && rtld_multiple_ref)
+     {
+       /* There was an explicit ref to the dynamic linker as a shared lib.
diff --git a/core/eventlog/PKGBUILD b/core/eventlog/PKGBUILD
index 80ec8b064..92abd7bcc 100644
--- a/core/eventlog/PKGBUILD
+++ b/core/eventlog/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=eventlog
 pkgver=0.2.12
 pkgrel=3
 pkgdesc="API to format and send structured log messages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.balabit.com/support/community/products/"
 license=('BSD')
 depends=('glibc')
diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD
index 6062d4952..1864a6a2a 100644
--- a/core/expat/PKGBUILD
+++ b/core/expat/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=expat
 pkgver=2.0.1
-pkgrel=7
+pkgrel=7.1
 pkgdesc="An XML parser library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://expat.sourceforge.net/"
 license=('custom')
 depends=('glibc')
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index 1fb2370ff..d3fd6f97d 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fakeroot
 pkgver=1.18.2
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/fakeroot"
 groups=('base-devel')
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 3eb77188b..482a40afc 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=file
 pkgver=5.10
 pkgrel=1
 pkgdesc="File type identification utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 groups=('base')
 url="http://www.darwinsys.com/file/"
diff --git a/core/findutils/PKGBUILD b/core/findutils/PKGBUILD
index e8d3d8c31..54dd26005 100644
--- a/core/findutils/PKGBUILD
+++ b/core/findutils/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=findutils
 pkgver=4.4.2
-pkgrel=4
+pkgrel=4.1
 pkgdesc="GNU utilities to locate files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 groups=('base')
 depends=('glibc' 'sh')
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index b6d795076..62a73bbfc 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=flex
 pkgver=2.5.35
-pkgrel=5
+pkgrel=5.1
 pkgdesc="A tool for generating text-scanning programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://flex.sourceforge.net"
 license=('custom')
 groups=('base-devel')
diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD
index aadd346cf..9a7414798 100644
--- a/core/gawk/PKGBUILD
+++ b/core/gawk/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gawk
 pkgver=4.0.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="GNU version of awk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/directory/GNU/gawk.html"
 license=('GPL')
 groups=('base')
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 2a0bdbb2f..32a53b565 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -4,26 +4,36 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
 
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+if [[ "${CARCH}" != "mips64el" ]]; then
+    pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+else
+    pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
+fi
 pkgver=4.6.2
 pkgrel=6
 _snapshot=4.6-20120120
 _libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+if [[ "${CARCH}" != "mips64el" ]]; then
+    makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+else
+    makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl')
+fi
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
+        gcc_mips64el_lib.patch
 	gcc-hash-style-both.patch)
 md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
          '450772ce32daed97d7383199f8797f33'
          '4030ee1c08dd1e843c0225b772360e76'
+         '67e337993d821d72fccacbed52d48c34'
          '4df25b623799b148a0703eaeec8fdf3f')
 
 if [ -n "${_snapshot}" ]; then
@@ -43,6 +53,8 @@ build() {
 
   if [ "${CARCH}" = "x86_64" ]; then
     patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  elif [ "${CARCH}" = "mips64el" ]; then
+    patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
@@ -51,11 +63,18 @@ build() {
   cd ${srcdir}
   mkdir gcc-build && cd gcc-build
 
+
+  if [[ "${CARCH}" != "mips64el" ]]; then
+      languages=c,c++,ada,fortran,go,lto,objc,obj-c++
+  else
+      languages=c,c++,fortran,lto,objc,obj-c++
+  fi
+
   ${_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++ \
+      --with-bugurl=https://bugs.parabolagnulinux.org/ \
+      --enable-languages=$languages \
       --enable-shared --enable-threads=posix \
       --with-system-zlib --enable-__cxa_atexit \
       --disable-libunwind-exceptions --enable-clocale=gnu \
@@ -96,16 +115,16 @@ package_gcc-libs()
   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-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}
+  rm -rf ${pkgdir}/usr/lib{,32}/{gcc/,libgfortran.spec}
 
   # remove static libraries
   find ${pkgdir} -name *.a -delete
-  
+
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
@@ -119,21 +138,21 @@ package_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/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
+  rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm -f $pkgdir/usr/lib{,32}/*.so*
+  rm -f $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm -f $pkgdir/usr/lib{,32}/libgfortran.spec
+  rm -rf $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm -f $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm -f $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
+  rm -rf $pkgdir/usr/lib{,32}/go
+  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm -f $pkgdir/usr/share/man/man3/ffi*
 
   # many packages require these symlinks
   install -dm755 ${pkgdir}/lib
@@ -200,11 +219,11 @@ package_gcc-fortran()
   make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
   make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
   install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
+
   # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
+  rm -f ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
+  rm -f ${pkgdir}/usr/share/info/libquadmath.info
+
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
@@ -221,7 +240,7 @@ package_gcc-objc()
   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
 
   # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/libobjc.so*
+  rm -f ${pkgdir}/usr/lib{,32}/libobjc.so*
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
@@ -237,7 +256,7 @@ package_gcc-ada()
   cd gcc-build/gcc
   make -j1 DESTDIR=$pkgdir ada.install-{common,info}
   install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-  
+
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install
index 23553b8f0..a880434ae 100644
--- a/core/gcc/gcc-libs.install
+++ b/core/gcc/gcc-libs.install
@@ -4,13 +4,13 @@ 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
+    [ -f $infodir/$file.gz ] && 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
+    [ -f $infodir/$file.gz ] && install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch b/core/gcc/gcc_mips64el_lib.patch
index 425758e88..425758e88 100644
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch
+++ b/core/gcc/gcc_mips64el_lib.patch
diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD
index 30570ddf8..393a4abbe 100644
--- a/core/gdbm/PKGBUILD
+++ b/core/gdbm/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'sh')
 source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz
         gdbm-1.10-zeroheaders.patch)
diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index 8b915e52f..7e8af9342 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gettext
 pkgver=0.18.1.1
 pkgrel=4
 pkgdesc="GNU internationalization library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gettext/"
 license=('GPL')
 groups=('base')
@@ -19,7 +19,7 @@ md5sums=('3dd55b952826d2b32f51308f2f91aa89')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c
-  ./configure --prefix=/usr --enable-csharp
+  ./configure --build=$CHOST --prefix=/usr --enable-csharp
   make
 }
 
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 5b5e98dbe..075b45073 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.30.2
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('pcre' 'libffi')
 makedepends=('pkgconfig' 'python2')
diff --git a/core/glibc/.arch b/core/glibc/.arch
new file mode 100644
index 000000000..9fe4d07f7
--- /dev/null
+++ b/core/glibc/.arch
@@ -0,0 +1 @@
+mips64el=false
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 761a6684d..730633e9c 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.15
 pkgrel=3
 _glibcdate=20111227
 pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
@@ -21,6 +21,7 @@ backup=(etc/gai.conf
 options=('!strip')
 install=glibc.install
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
+        http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz
         glibc-2.10-dont-build-timezone.patch
         glibc-2.10-bz4781.patch
         glibc-__i686.patch
@@ -58,6 +59,15 @@ mksource() {
   git checkout -b glibc-2.15-arch origin/master
   popd
   tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
+  mksource-ports
+}
+
+mksource-ports() {
+  git clone git://sourceware.org/git/glibc-ports.git
+  pushd glibc-ports
+  git checkout -b glibc-2.14-arch origin/release/2.14/master
+  popd
+  tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/*
 }
 
 build() {
@@ -106,6 +116,8 @@ build() {
   # obviously not a real fix...
   patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
 
+  ln -s ../glibc-ports ports
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -116,6 +128,9 @@ 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"
+  elif [[ ${CARCH} = "mips64el" ]]; then
+    # mips64el is only supported out of tree.
+    extra_addons=",ports"
   fi
 
   echo "slibdir=/lib" >> configparms
@@ -127,7 +142,7 @@ build() {
   ${srcdir}/glibc/configure --prefix=/usr \
       --libdir=/usr/lib --libexecdir=/usr/lib \
       --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
+      --enable-add-ons=nptl,libidn$extra_addons \
       --enable-kernel=2.6.27 \
       --with-tls --with-__thread \
       --enable-bind-now --without-gd \
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index 60ed858b2..e8a2c1367 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmp
 pkgver=5.0.2
 pkgrel=3
 pkgdesc="A free library for arbitrary precision arithmetic"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmplib.org/"
 depends=('gcc-libs' 'sh')
 license=('LGPL3')
@@ -22,6 +22,7 @@ build() {
   patch -Np1 -i $srcdir/538dfce27f41.patch
   
   [ "${CARCH}" = "i686" ] && export ABI="32"
+  [ "${CARCH}" = "mips64el" ] && export ABI="n32"
   ./configure --build=${CHOST} \
     --prefix=/usr --infodir=/usr/share/info \
     --enable-cxx
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index 6d315225c..70aa978f1 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpm
 pkgver=1.20.6
 pkgrel=7
 pkgdesc="A mouse server for the console and xterm"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nico.schottelius.org/software/gpm/"
 license=('GPL')
 depends=('ncurses' 'bash')
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index ee0dcc114..5cd2533f6 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=grep
 pkgver=2.10
 pkgrel=1
 pkgdesc="A string search utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/grep/grep.html"
 groups=('base')
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index f007e1d23..f9661d3f4 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=groff
 pkgver=1.21
 pkgrel=2
 pkgdesc="GNU troff text-formatting system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/groff/groff.html"
 license=('GPL')
 depends=('perl' 'gcc-libs' 'texinfo')
diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD
index 67e967ed8..d6ce70c31 100644
--- a/core/gzip/PKGBUILD
+++ b/core/gzip/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gzip
 pkgver=1.4
-pkgrel=4
+pkgrel=4.1
 pkgdesc="GNU compression utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gzip/"
 license=('GPL3')
 groups=('base')
diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD
index eed4fe23e..d793bb3cf 100644
--- a/core/hdparm/PKGBUILD
+++ b/core/hdparm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hdparm
 pkgver=9.38
 pkgrel=1
 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('glibc')
 optdepends=('sh: required by idectl and ultrabayd')
 source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz
diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD
index f8c8129dc..e08a0246e 100644
--- a/core/heirloom-mailx/PKGBUILD
+++ b/core/heirloom-mailx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=heirloom-mailx
 pkgver=12.5
 pkgrel=3
 pkgdesc="A commandline utility for sending and receiving email"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://heirloom.sourceforge.net/mailx.html"
 license=('custom')
 groups=('base')
diff --git a/core/idnkit/PKGBUILD b/core/idnkit/PKGBUILD
index 2a5fd256c..74b1cb6b5 100644
--- a/core/idnkit/PKGBUILD
+++ b/core/idnkit/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Provides functionalities about Internationalized Domain Name processing'
 url='http://www.nic.ad.jp/ja/idn/idnkit/download/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 options=('!makeflags' '!libtool')
 source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz")
@@ -19,6 +19,8 @@ backup=('etc/idnalias.conf' 'etc/idn.conf')
 build() {
 	cd "${srcdir}/idnkit-${pkgver}-src"
 	./configure \
+    --host=$CHOST \
+    --build=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD
index a730f2f5e..b5e4897a9 100644
--- a/core/ifenslave/PKGBUILD
+++ b/core/ifenslave/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ifenslave
 pkgver=1.1.0
 pkgrel=7
 pkgdesc='Utility for bonding ethernet interfaces'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxfoundation.org/en/Net:Bonding'
 license=('GPL2')
 depends=('glibc')
@@ -27,3 +27,5 @@ package() {
 	install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave
 	install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding
 }
+sha1sums=('627333f410809971409023fda6a8b1de419146ba'
+          '6843971c0254768868b556af33289d7d32d6208d')
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 55f74f01e..c72a665aa 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=inetutils
 pkgver=1.9.1
 pkgrel=1
 pkgdesc="A collection of common network programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL3')
 groups=('base')
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index b017ba58b..90199ce49 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iproute2
 pkgver=3.2.0
 pkgrel=2
 pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.linux-foundation.org/en/Net:Iproute2"
 depends=('glibc' 'db')
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 8da7cbee6..390d6d482 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=iptables
 pkgver=1.4.12.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc='Linux kernel packet control tool'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://www.netfilter.org/projects/iptables/index.html'
 depends=('glibc' 'bash')
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index 0d585e312..bf24c3a6e 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=iputils
 pkgver=20101006
 _traceroutever=1.4a12
-pkgrel=2
+pkgrel=2.1
 pkgdesc="IP Configuration Utilities (and Ping)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.linuxfoundation.org/en/Net:Iputils"
 groups=('base')
@@ -31,12 +31,14 @@ build() {
   # Doc fails to build (see FS#20251)
   # As a temporary workaround, we use these man pages from Fedora & LFS
   patch -Np1 -i ../iputils-s20101006-manpages.patch
+  find . -name Makefile | xargs sed -ri 's/^(CCOPT=.*)$/\1 '"${CFLAGS}"'/'
   make
 
   # build traceroute
   # this is combined in this package because it's awkward as a separate package
   cd "${srcdir}/traceroute-${_traceroutever}"
   patch -Np1 -i ../permission-fix.patch
+  find . -name Makefile.in | xargs sed -ri 's/^(CCOPT=.*)$/\1 '"${CFLAGS}"'/'
   ./configure --prefix=/usr \
               --sbindir=/bin \
               --mandir=/usr/share/man
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index fc65267df..bf6b8b147 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=isl
 pkgver=0.07
 pkgrel=1
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kotnet.org/~skimo/isl/"
 license=('LGPL2.1')
 options=('!libtool')
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 8d6015157..260ec0c2e 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=iw
 pkgver=3.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://wireless.kernel.org/en/users/Documentation/iw"
 license=("GPL")
 depends=("libnl")
-makedepends=("kernel-headers")
+makedepends=("linux-api-headers" "pkg-config")
 source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb')
 
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index fee4867a2..8ed938017 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=jfsutils
 pkgver=1.1.15
 pkgrel=3
 pkgdesc='JFS filesystem utilities'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://jfs.sourceforge.net'
 license=('GPL')
 groups=('base')
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index efe8d3ede..23d04ad5c 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=kbd
 pkgver=1.15.3
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Keytable files and keyboard utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
 license=('GPL')
 depends=('glibc')
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
index 747257aba..5a9db6545 100644
--- a/core/keyutils/PKGBUILD
+++ b/core/keyutils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=keyutils
 pkgver=1.5.5
 pkgrel=1
 pkgdesc="Linux Key Management Utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.kernel.org"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc' 'sh')
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index e93b19963..9eb17fc59 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=krb5
 pkgver=1.9.2
 pkgrel=2
 pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
 license=('custom')
 depends=('e2fsprogs' 'libldap' 'keyutils')
diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD
index 20d09d07d..5edb5273f 100644
--- a/core/less/PKGBUILD
+++ b/core/less/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=less
 pkgver=444
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A terminal based program for viewing text files"
 license=('GPL3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.greenwoodsoftware.com/less"
 groups=('base')
 depends=('ncurses' 'pcre')
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index 1be3116b4..a447951a5 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libarchive
 pkgver=3.0.3
 pkgrel=3
 pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 5e5bba5e8..6fc8cb8eb 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libcap
 pkgver=2.22
-pkgrel=2
+pkgrel=2.1
 pkgdesc="POSIX 1003.1e capabilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sites.google.com/site/fullycapable/"
 license=('GPL2')
 depends=('glibc' 'attr')
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD
index 280b04ec4..59b8c9433 100644
--- a/core/libedit/PKGBUILD
+++ b/core/libedit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libedit
 pkgver=20110802_3.0
 pkgrel=1
 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.thrysoee.dk/editline/'
 license=('BSD')
 depends=('ncurses')
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index 45cf1208f..6bad9b288 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libevent
 pkgver=2.0.16
 pkgrel=1
 pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.monkey.org/~provos/libevent/"
 license=('GPL2')
 depends=('openssl')
diff --git a/core/libfetch/PKGBUILD b/core/libfetch/PKGBUILD
index 328ebcf88..7ad51c2b5 100644
--- a/core/libfetch/PKGBUILD
+++ b/core/libfetch/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libfetch
 pkgver=2.33
 pkgrel=3
 pkgdesc="URL based download library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('openssl>=1.0.0')
 url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/"
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index 974f69b8a..ec4077548 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgcrypt
 pkgver=1.5.0
 pkgrel=1
 pkgdesc="a general purpose crypto library based on the code used"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
 license=('LGPL')
 depends=('libgpg-error>=1.9')
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index b0cbef1c0..d24c58623 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgpg-error
 pkgver=1.10
 pkgrel=1
 pkgdesc="Support library for libgcrypt"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
 license=('LGPL')
 depends=('glibc' 'sh')
diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD
index d651bf612..3d7678a0c 100644
--- a/core/libgssglue/PKGBUILD
+++ b/core/libgssglue/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgssglue
 pkgver=0.3
 pkgrel=1
 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 license=('BSD')
 depends=('glibc')
diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD
index f482d4104..df2984082 100644
--- a/core/libmpc/PKGBUILD
+++ b/core/libmpc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmpc
 pkgver=0.9
 pkgrel=2
 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.multiprecision.org/"
 license=('LGPL')
 depends=('mpfr>=3.0.0')
diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD
index 18803a30f..29edac2e7 100644
--- a/core/libnl/PKGBUILD
+++ b/core/libnl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnl
 pkgver=1.1
 pkgrel=3
 pkgdesc="Library for applications dealing with netlink sockets"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.infradead.org/~tgr/libnl/"
 license=('GPL')
 depends=('glibc')
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index 0cddb1358..9184647f8 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpcap
 pkgver=1.2.1
 pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh')
diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD
index bbc315315..513901bbc 100644
--- a/core/libpipeline/PKGBUILD
+++ b/core/libpipeline/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpipeline
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libpipeline.nongnu.org/"
 license=('GPL')
 depends=('glibc')
diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD
index 71bb1bf39..6e571f9ee 100644
--- a/core/librpcsecgss/PKGBUILD
+++ b/core/librpcsecgss/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=librpcsecgss
 pkgver=0.19
 pkgrel=7
 pkgdesc="Library for RPCSECGSS support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 license=('GPL')
 depends=('glibc' 'krb5' 'libgssglue')
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index e668cda48..19065a8a0 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -10,11 +10,11 @@ pkgname=libsasl
 pkgver=2.1.23
 pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
 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
@@ -97,6 +97,8 @@ build() {
   popd
 
   ./configure --prefix=/usr \
+      --host=$CHOST \
+      --build=$CHOST \
       --mandir=/usr/share/man \
       --infodir=/usr/share/info \
       --disable-static \
diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD
index 3fcc6eccd..4a7212c91 100644
--- a/core/libssh2/PKGBUILD
+++ b/core/libssh2/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=1.3.0
 pkgrel=1
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
 url="http://www.libssh2.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('openssl')
 makedepends=('zlib')
diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD
index 6035cdb2c..fac744d86 100644
--- a/core/libtirpc/PKGBUILD
+++ b/core/libtirpc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libtirpc
 pkgver=0.2.2
 pkgrel=2
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 mips64el)
 url="http://libtirpc.sourceforge.net/"
 license=('BSD')
 depends=('libgssglue')
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index dc3efba50..dd52c6771 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -8,16 +8,19 @@ pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
 pkgrel=2
 pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
 options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}
+        nopic.patch)
 md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
+         '1e6ba57420c82c663c85e745d11c7eed'
+         '46443cf0e3e1b4e4891812af73385615')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
+  [ "$CARCH" = "mips64el" ] && patch -Np1 -i "${srcdir}/nopic.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/core/libtool/nopic.patch b/core/libtool/nopic.patch
new file mode 100644
index 000000000..43a712685
--- /dev/null
+++ b/core/libtool/nopic.patch
@@ -0,0 +1,13 @@
+Index: libtool-2.2.6a/tests/demo-nopic.test
+===================================================================
+--- libtool-2.2.6a.orig/tests/demo-nopic.test	2008-11-18 21:11:29.000000000 +0000
++++ libtool-2.2.6a/tests/demo-nopic.test	2008-11-18 21:12:41.000000000 +0000
+@@ -26,7 +26,7 @@
+ . tests/defs || exit 1
+ 
+ case "$host" in
+-hppa*|x86_64*|s390*)
++hppa*|x86_64*|s390*|mips*|arm*)
+ 	func_skip "$host doesn't like non-PIC shared libs"
+ 	;;
+ *-solaris*|*-sunos*)
diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD
index e2f771999..ff8b34a8b 100644
--- a/core/libusb-compat/PKGBUILD
+++ b/core/libusb-compat/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libusb-compat
 pkgver=0.1.3
 pkgrel=2
 pkgdesc="Library to enable user space application programs to communicate with USB devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libusb' 'sh')
 url="http://libusb.sourceforge.net/"
 license=('LGPL')
diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD
index 31f148fc1..c7ab438b6 100644
--- a/core/libusb/PKGBUILD
+++ b/core/libusb/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.0.8
 pkgrel=2
 depends=('glibc')
 pkgdesc="Library to enable user space application programs to communicate with USB devices."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://libusb.sourceforge.net/"
 license=('LGPL')
 source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index 5e76655a5..dd21b968a 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=links
 pkgver=2.4
 pkgrel=1
 pkgdesc="A text WWW browser, similar to Lynx"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://links.twibright.com/"
 license=('GPL')
 depends=('bzip2' 'zlib' 'openssl' 'gpm')
diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD
index d69936a88..370a5cf2c 100644
--- a/core/linux-api-headers/PKGBUILD
+++ b/core/linux-api-headers/PKGBUILD
@@ -8,23 +8,18 @@ pkgver=3.1.6
 _basever=3.1
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
 provides=("kernel-headers=${pkgver}")
 conflicts=('kernel-headers')
 replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
-	http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
-# NOTE: signatures are not automatically verified by makepkg
-        #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
-	#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
-md5sums=('edbdc798f23ae0f8045c82f6fa22c536'
-         'b59adeac6d593fe993e964ea9e259c42')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-libre/linux-${_basever}-libre.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basever}-libre-${pkgver}-libre.xz")
 
 build() {
   cd ${srcdir}/linux-${_basever}
-  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver}
+  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${_basever}-libre-${pkgver}-libre
 
   make mrproper
   make headers_check
diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD
index e8aaf626f..5134874b1 100644
--- a/core/linux-atm/PKGBUILD
+++ b/core/linux-atm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=linux-atm
 pkgver=2.5.2
 pkgrel=1
 pkgdesc="Drivers and tools to support ATM networking under Linux."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 url="http://linux-atm.sourceforge.net/"
 license=(GPL)
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index c59ae4eca..4d31f5f17 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=logrotate
 pkgver=3.8.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Rotates system logs automatically"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/logrotate/"
 license=('GPL')
 groups=('base')
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 2bfdc78b0..f736cc8ac 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.88
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
 groups=('base')
diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD
index dd0c5e65b..7b56fe632 100644
--- a/core/lzo2/PKGBUILD
+++ b/core/lzo2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lzo2
 pkgver=2.06
 pkgrel=1
 pkgdesc="Portable lossless data compression library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.oberhumer.com/opensource/lzo"
 license=('GPL')
 depends=('glibc')
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD
index de13524da..749937e1a 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=m4
 pkgver=1.4.16
-pkgrel=2
+pkgrel=2.1
 pkgdesc="The GNU macro processor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/m4"
 license=('GPL3')
 groups=('base-devel')
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 3f38c53f3..4106f80fa 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=make
 pkgver=3.82
 pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/make"
 license=('GPL3')
 groups=('base-devel')
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index ca050cef0..c2cbd3f21 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=man-db
 pkgver=2.6.0.2
 pkgrel=3
 pkgdesc="A utility for reading man pages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/man-db/"
 license=('GPL' 'LGPL')
 groups=('base')
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 5c7819708..6b3fabee0 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -5,7 +5,7 @@ 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)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://neil.brown.name/blog/mdadm"
 groups=('base')
diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD
index eb4f651d9..22980acea 100644
--- a/core/mkinitcpio-busybox/PKGBUILD
+++ b/core/mkinitcpio-busybox/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=mkinitcpio-busybox
 pkgver=1.19.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.busybox.net/"
 license=('GPL')
 depends=('glibc')
@@ -19,7 +19,12 @@ sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9'
 build() {
   cd "$srcdir/busybox-$pkgver"
 
-  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
+  case $CARCH in
+  mips64el)
+    local safeflags='loongson2f -O2 -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;;
+  *)
+    local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;;
+  esac
 
   sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
     "$srcdir/config" > .config
diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD
index 78d5c4737..69b494888 100644
--- a/core/mkinitcpio-nfs-utils/PKGBUILD
+++ b/core/mkinitcpio-nfs-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mkinitcpio-nfs-utils
 pkgver=0.2
 pkgrel=2
 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/"
 license=('GPL2')
 depends=('glibc')
diff --git a/core/mkinitcpio/PKGBUILD b/core/mkinitcpio/PKGBUILD
new file mode 100644
index 000000000..faed61e50
--- /dev/null
+++ b/core/mkinitcpio/PKGBUILD
@@ -0,0 +1,30 @@
+pkgname=mkinitcpio
+pkgver=0.7.5
+pkgrel=1
+pkgdesc="Modular initramfs image creation utility"
+arch=('mips64el')
+url="http://www.archlinux.org/"
+license=('GPL')
+depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
+         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip')
+optdepends=('xz: Use lzma or xz compression for the initramfs image'
+            'bzip2: Use bzip2 compression for the initramfs image'
+            'lzop: Use lzo compression for the initramfs image'
+            'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
+replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
+          'klibc-module-init-tools' 'klibc-udev')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	'patch.patch')
+backup=(etc/mkinitcpio.conf)
+sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9'
+	    'abf6bb9d692838cc2f97f12f0901f0209dbf6f437f9590accd26dbcfc48f1b16')
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch install/base ../patch.patch
+
+  make DESTDIR="$pkgdir" install
+}
+sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9'
+            'bb6517e0497cc43aea1287e43b0be2892b7af74add5eca3f3740b091f997729e')
diff --git a/core/mkinitcpio/patch.patch b/core/mkinitcpio/patch.patch
new file mode 100644
index 000000000..62dadac32
--- /dev/null
+++ b/core/mkinitcpio/patch.patch
@@ -0,0 +1,11 @@
+--- install/base	2011-10-22 12:37:45.000000000 -0300
++++ install/base.orig	2011-11-03 19:54:45.574991740 -0300
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ 
+ build() {
+-    for dir in new_root proc sys dev run usr/{bin,sbin}; do
++    for dir in new_root proc sys dev run usr/{bin,sbin} lib32; do
+         add_dir "/$dir"
+     done
+ 
diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD
index ef1b74590..818bae57c 100644
--- a/core/mlocate/PKGBUILD
+++ b/core/mlocate/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mlocate
 pkgver=0.24
 pkgrel=2
 pkgdesc="Faster merging drop-in for slocate"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
 license=('GPL')
 conflicts=('slocate')
diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD
index b6050d66d..1e3b467f9 100644
--- a/core/module-init-tools/PKGBUILD
+++ b/core/module-init-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=module-init-tools
 pkgver=3.16
 pkgrel=3
 pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://modules.wiki.kernel.org"
 license=('GPL')
 depends=('glibc')
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index 7c342a21d..f51d9e2a0 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -8,7 +8,8 @@ _patchlevel=p3
 pkgver=${_pkgver}.${_patchlevel}
 pkgrel=1
 pkgdesc="Multiple-precision floating-point library"
-arch=('i686' 'x86_64')
+license=('LGPL')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mpfr.org/"
 license=('LGPL')
 depends=('gmp>=5.0')
diff --git a/core/nano/PKGBUILD b/core/nano/PKGBUILD
index 29daecb1a..08eb2d3e7 100644
--- a/core/nano/PKGBUILD
+++ b/core/nano/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=nano
 pkgver=2.2.6
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Pico editor clone with enhancements"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.nano-editor.org"
 groups=('base')
diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD
index fdf6a0343..4c816ce0b 100644
--- a/core/ncurses/PKGBUILD
+++ b/core/ncurses/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ncurses
 pkgver=5.9
-pkgrel=2
+pkgrel=2.1
 pkgdesc="System V Release 4.0 curses emulation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ncurses/"
 license=('MIT')
 depends=('glibc')
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 605620a09..fd9b0d216 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=net-tools
 pkgver=1.60.20110819cvs
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.tazenda.demon.co.uk/phil/net-tools"
 depends=('glibc')
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index cdcbf3e86..4ec7c926d 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -7,9 +7,9 @@
 
 pkgname=nfs-utils
 pkgver=1.2.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://nfs.sourceforge.net'
 license=('GPL')
 backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD
index a402e5c84..08a78b077 100644
--- a/core/nfsidmap/PKGBUILD
+++ b/core/nfsidmap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nfsidmap
 pkgver=0.24
 pkgrel=3
 pkgdesc="Library to help mapping IDs, mainly for NFSv4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 depends=('glibc' 'libldap>=2.4.18')
 license=('custom:nfsidmap')
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 4624df060..88ffd0291 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nilfs-utils
 pkgver=2.1.0
 pkgrel=2
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nilfs.org/"
 license=('GPL2' 'LGPL2.1')
 backup=('etc/nilfs_cleanerd.conf')
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 8351587b4..32a6acafe 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -5,10 +5,10 @@ pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.28
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'groff')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
         slapd slapd.default ntlm.patch)
 sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index a09087ac1..9b97d4c04 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openssh
 pkgver=5.9p1
 pkgrel=5
 pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index c622f21c6..8a9b94575 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -7,7 +7,7 @@ _ver=1.0.0g
 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')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://www.openssl.org'
 license=('custom:BSD')
 depends=('perl')
@@ -18,25 +18,24 @@ 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'
+        'gnu-linux-mips64el-gcc.patch'
         'ca-dir.patch')
 md5sums=('07ecbe4324f140d157478637d6beccf1'
          '34315cf0fbbd1d18435948eb9712fcdf'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
+         'd7115f0cc44df346d7b68c681819f94b'
          '3bf51be3a1bbd262be46dc619f92aa90')
 
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('imake')
+
 # 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
@@ -44,11 +43,32 @@ build() {
 	patch -p0 -i $srcdir/no-rpath.patch
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
+
+	patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch
+
+  case "${CARCH}" in
+	'x86_64')
+		openssltarget='linux-x86_64' ;;
+	'i686')
+		openssltarget='linux-elf' ;;
+	'mips64el')
+#    ./config
+		openssltarget='gnu-linux-mips64el-gcc' ;;
+	#	openssltarget='linux-generic32' ;;
+	esac
+
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+  if [ "$CARCH" = "mips64el" ]; then
+	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
+		shared zlib enable-md2 \
+		"${openssltarget}" -Wa,--noexecstack "${CFLAGS}"
+  else
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib enable-md2 \
 		"${openssltarget}" \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+    -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+
+  fi
 
 	make depend
 	make
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index 1122a3844..6bda23d46 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=openvpn
 pkgver=2.2.2
 pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://openvpn.net/index.php/open-source.html"
 depends=('openssl' 'lzo2' 'iproute2')
 license=('custom')
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index c0f4b4841..a1d698271 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -6,11 +6,13 @@ pkgname=pam
 pkgver=1.1.5
 pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('flex' '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
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD
index 8c0185fa9..e66b9163b 100644
--- a/core/patch/PKGBUILD
+++ b/core/patch/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=patch
 pkgver=2.6.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A utility to apply patch files to original sources"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/patch/patch.html"
 license=('GPL')
 groups=('base-devel')
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 0cf79dfb3..28017b729 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pciutils
 pkgver=3.1.8
 pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 groups=('base')
 url="http://mj.ucw.cz/pciutils.html"
diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
index fee30155d..6c165e745 100644
--- a/core/pcmciautils/PKGBUILD
+++ b/core/pcmciautils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pcmciautils
 pkgver=018
 pkgrel=1
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 license=('GPL')
 groups=('base')
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index 5d98eea9f..d828db0a9 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pcre
 pkgver=8.21
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pcre.org/"
 license=('BSD')
 depends=('gcc-libs')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 9fc4a5700..c32205957 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl
 pkgver=5.14.2
 pkgrel=7
 pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://www.perl.org"
 groups=('base')
diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD
index ce42fd9b7..ed96f3380 100644
--- a/core/pkg-config/PKGBUILD
+++ b/core/pkg-config/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=pkg-config
 pkgver=0.26
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A system for managing library compile/link flags"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pkgconfig.freedesktop.org/wiki/"
 license=('GPL')
 groups=('base-devel')
diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD
index 202126bab..09ec1ca1a 100644
--- a/core/popt/PKGBUILD
+++ b/core/popt/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=popt
 pkgver=1.16
 pkgrel=4
 pkgdesc="A commandline option parser"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rpm5.org"
 license=('custom')
 depends=('glibc')
diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD
index 953f1da9b..57cb47e14 100644
--- a/core/ppl/PKGBUILD
+++ b/core/ppl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ppl
 pkgver=0.11.2
 pkgrel=2
 pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.unipr.it/ppl"
 license=('GPL3')
 depends=('gmp>=5.0')
@@ -16,6 +16,11 @@ md5sums=('ce014f153a28006009db207ca953a984')
 
 build() {
   cd $srcdir/ppl-$pkgver
+  # Workaround madd.d making a SIGILL on a NaN.
+  [ "$CARCH" == "mips64el" ] && {
+    CFLAGS=${CFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f}
+    CXXFLAGS=${CXXFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f}
+  }
   ./configure --prefix=/usr --enable-interfaces="c,cxx"
   make
 }
diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD
index 33c7eccd1..e9e6d7c32 100644
--- a/core/ppp/PKGBUILD
+++ b/core/ppp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=ppp
 pkgver=2.4.5
 pkgrel=3
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
-arch=(i686 x86_64) 
+arch=(i686 x86_64 'mips64el') 
 url="http://www.samba.org/ppp/"
 license=('custom:GPL/BSD')
 groups=('base')
diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD
index b27c7d5bc..1040e8ba9 100644
--- a/core/pptpclient/PKGBUILD
+++ b/core/pptpclient/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pptpclient
 pkgver=1.7.2
 pkgrel=4
 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pptpclient.sourceforge.net/"
 license=('GPL')
 depends=('ppp' 'iproute2')
diff --git a/core/procinfo-ng/PKGBUILD b/core/procinfo-ng/PKGBUILD
index e63a20625..45fa85e68 100644
--- a/core/procinfo-ng/PKGBUILD
+++ b/core/procinfo-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=procinfo-ng
 pkgver=2.0.304
 pkgrel=3
 pkgdesc="Displays useful information from /proc"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://procinfo-ng.sourceforge.net/"
 license=('GPL2' 'LGPL2.1')
 depends=('ncurses' 'perl')
diff --git a/core/procps/PKGBUILD b/core/procps/PKGBUILD
index b04ebf52c..99d7884a7 100644
--- a/core/procps/PKGBUILD
+++ b/core/procps/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=procps
 pkgver=3.2.8
 pkgrel=4
 pkgdesc="Utilities for monitoring your system and processes on your system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://procps.sourceforge.net/"
 license=('GPL' 'LGPL')
 groups=('base')
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD
index 1783c528a..4afc63462 100644
--- a/core/psmisc/PKGBUILD
+++ b/core/psmisc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=psmisc
 pkgver=22.14
 pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://psmisc.sourceforge.net/index.html"
 license=('GPL')
 groups=('base')
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index fa21580c0..e86d50fcb 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -8,7 +8,7 @@ _patchlevel=002 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="GNU readline library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
 license=('GPL')
 depends=('glibc' 'ncurses')
diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD
index ca73bf439..769a72908 100644
--- a/core/reiserfsprogs/PKGBUILD
+++ b/core/reiserfsprogs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=reiserfsprogs
 pkgver=3.6.21
 pkgrel=4
 pkgdesc="Reiserfs utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/"
 license=('GPL')
 groups=('base')
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 95a615f00..040eef5b6 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rfkill
 pkgver=0.4
 pkgrel=3
 pkgdesc="A tool for enabling and disabling wireless devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwireless.org/en/users/Documentation/rfkill"
 license=('custom')
 depends=('glibc' 'filesystem>=2010.01')
diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD
index e4ef1f876..c38f302fd 100644
--- a/core/rpcbind/PKGBUILD
+++ b/core/rpcbind/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rpcbind
 pkgver=0.2.0
 pkgrel=6
 pkgdesc="portmap replacement which supports RPC over various protocols"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('bash' 'glibc' 'libtirpc')
 url="http://rpcbind.sourceforge.net"
 license=('custom')
diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD
index 3ae03c979..792ecf9c2 100644
--- a/core/run-parts/PKGBUILD
+++ b/core/run-parts/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=run-parts
 pkgver=4.0.4
 pkgrel=1
 pkgdesc='run scripts or programs in a directory'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://packages.qa.debian.org/d/debianutils.html'
 license=('GPL')
 depends=('glibc')
diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD
index 0bf5ea56f..b1497971a 100644
--- a/core/sdparm/PKGBUILD
+++ b/core/sdparm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdparm
 pkgver=1.06
 pkgrel=2
 pkgdesc="An utility similar to hdparm but for SCSI devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sg.danny.cz/sg/sdparm.html"
 license=('BSD')
 depends=('glibc')
diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD
index 5e268d05e..b83f77aaf 100644
--- a/core/sed/PKGBUILD
+++ b/core/sed/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=sed
 pkgver=4.2.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="GNU stream editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/sed"
 license=('GPL3')
 groups=('base')
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 000ffcbc1..e46251076 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=shadow
 pkgver=4.1.4.3
 pkgrel=5
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pkg-shadow.alioth.debian.org/'
 license=('BSD')
 groups=('base')
diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD
index f24676f44..6951af611 100644
--- a/core/sqlite3/PKGBUILD
+++ b/core/sqlite3/PKGBUILD
@@ -11,14 +11,12 @@ _docver=${_amalgamationver}	#3070700
 pkgver=3.7.10
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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'
@@ -64,25 +62,3 @@ package_sqlite3-tcl() {
   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/PKGBUILD b/core/sqlite3/PKGBUILD.mips64el
index 7c8032fc7..98f925d56 100644
--- a/testing/sqlite3/PKGBUILD
+++ b/core/sqlite3/PKGBUILD.mips64el
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 146781 2012-01-17 16:20:13Z andyrtr $
+# $Id: PKGBUILD 130058 2011-07-01 19:36:29Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3071000
+pkgname=('sqlite3' 'sqlite3-tcl') 
+_amalgamationver=3070701
 _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
-#pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.10
+pkgver=${_amalgamationver2//0/.}
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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'
+md5sums=('554026fe7fac47b1cf61c18d5fe43419'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
@@ -64,25 +60,3 @@ package_sqlite3-tcl() {
   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/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 9a160f365..a78fcaeb9 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=sudo
 _ver=1.8.3p1
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sudo.ws/sudo/"
 license=('custom')
 depends=('glibc' 'pam')
diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD
index 96b92b9ce..0d725bfb3 100644
--- a/core/sysfsutils/PKGBUILD
+++ b/core/sysfsutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sysfsutils
 pkgver=2.1.0
 pkgrel=7
 pkgdesc="System Utilities Based on Sysfs"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 url="http://linux-diag.sourceforge.net/Sysfsutils.html"
 groups=('base')
diff --git a/core/syslinux/.arch b/core/syslinux/.arch
new file mode 100644
index 000000000..9fe4d07f7
--- /dev/null
+++ b/core/syslinux/.arch
@@ -0,0 +1 @@
+mips64el=false
diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD
index 27045eca0..b521d1895 100644
--- a/core/sysvinit/PKGBUILD
+++ b/core/sysvinit/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Linux System V Init"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/sysvinit"
 license=('GPL')
 groups=('base')
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index f064f08c1..ffd5cb336 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tar
 pkgver=1.26
 pkgrel=2
 pkgdesc="Utility used to store, backup, and transport files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/tar/tar.html"
 license=('GPL3')
 groups=('base')
diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD
index 22ef3c6e5..d4463347d 100644
--- a/core/texinfo/PKGBUILD
+++ b/core/texinfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=texinfo
 pkgver=4.13a
 pkgrel=7
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/texinfo/"
 license=('GPL3')
 groups=('base')
diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD
index 54108609a..a1b8601c0 100644
--- a/core/tzdata/PKGBUILD
+++ b/core/tzdata/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 _tzcode=2011i
 _tzdata=2011n
 pkgdesc="Sources for time zone and daylight saving time data"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twinsun.com/tz/tz-link.htm"
 license=('GPL')
 depends=()
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 85be39214..ea10e0570 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase="udev"
 pkgname=('udev' 'udev-compat')
 pkgver=179
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
 license=('GPL')
 groups=('base')
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 4d2ca6ad2..3fe65e8c4 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=004
 pkgrel=1
 _usb_ids_date=2011.08.17
 pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 groups=('base')
 makedepends=('wget')
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 26faab001..2ce762a71 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -7,7 +7,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('base')
 depends=('filesystem')
 replaces=('linux32' 'util-linux-ng')
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD
index edb6f7939..315396003 100644
--- a/core/vi/PKGBUILD
+++ b/core/vi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=050325
 pkgrel=2
 epoch=1
 pkgdesc='The original ex/vi text editor.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ex-vi.sourceforge.net/'
 license=('custom:ex')
 depends=('ncurses')
diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD
index bb30e7e22..941e89846 100644
--- a/core/wget/PKGBUILD
+++ b/core/wget/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=wget
 pkgver=1.13.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A network utility to retrieve files from the Web"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/wget/wget.html"
 license=('GPL3')
 groups=('base')
diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD
index 65495fe69..6a60bea84 100644
--- a/core/which/PKGBUILD
+++ b/core/which/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=which
 pkgver=2.20
 pkgrel=5
 pkgdesc="A utility to show the full path of commands"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xs4all.nl/~carlo17/which"
 license=('GPL3')
 groups=('base')
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index cb6de3cd9..8019d8ae4 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=29
 pkgrel=6
 pkgdesc='Wireless Tools'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
 sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD
index e8559f15a..582bae1e3 100644
--- a/core/wpa_actiond/PKGBUILD
+++ b/core/wpa_actiond/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=wpa_actiond
 pkgver=1.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/wpa_actiond.git/"
 license=('GPL')
 depends=('glibc' 'wpa_supplicant')
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD
index 493dbf5f3..9ba3ad15a 100644
--- a/core/wpa_supplicant/PKGBUILD
+++ b/core/wpa_supplicant/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=wpa_supplicant
 pkgver=0.7.3
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl')
 optdepends=('wpa_supplicant_gui: wpa_gui program')
 license=('GPL')
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index 9dd73691c..e4fcf373b 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=xfsprogs
 pkgver=3.1.7
 pkgrel=1
 pkgdesc="XFS filesystem utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://oss.sgi.com/projects/xfs/"
 groups=('base')
@@ -17,6 +17,7 @@ md5sums=('049cf9873794ea49d0bb3f12d45748a4')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export OPTIMIZER="-march=${CARCH/_/-} -O1"
+  [ "$CARCH" = "mips64el" ] && export OPTIMIZER="-mabi=n32 -march=loongson2f -O1"
   export DEBUG=-DNDEBUG
   make
 }
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index f8cb321f1..8401ed2a9 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xinetd
 pkgver=2.3.14
 pkgrel=8
 pkgdesc="A secure replacement for inetd"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xinetd.org/"
 license=('custom')
 optdepends=('perl: for xconv.pl script')
@@ -25,7 +25,8 @@ md5sums=('567382d7972613090215c6c54f9b82d9'
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i "s#${prefix}/man#${prefix}/share/man#" configure
-  ./configure --prefix=/usr --without-libwrap
+  ./configure --prefix=/usr --without-libwrap \
+              --build=${CHOST} --host=${CHOST}
   make
 }
 
diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD
index e2c47b128..cb1c045b3 100644
--- a/core/xz/PKGBUILD
+++ b/core/xz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xz
 pkgver=5.0.3
 pkgrel=1
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tukaani.org/xz/'
 license=('GPL' 'LGPL' 'custom')
 depends=('sh')
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index d1f16c1b2..e92f893de 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=zlib
 pkgver=1.2.5
 pkgrel=4
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.zlib.net/"
 depends=('glibc')
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/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
deleted file mode 100644
index ca0ca775e..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# Contributor: Nicolás Reynolds <fauno@parabola.nu>
-# Contributor (mipsel): Vojtech Horky <vojta . horky at-symbol seznam . cz>
-# This package is used to bootstrap a cross glibc and full featured cross gcc
-# Change the following variables to match your target
-_pkgname=gcc
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-_ARCH=mips
-
-unset LDFLAGS CFLAGS CXXFLAGS
-
-pkgname=cross-${_target}-gcc-core-shared
-pkgver=4.6.2
-pkgrel=8
-pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (shared version)"
-url="http://www.gnu.org/software/binutils/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libmpc' 'sh' "${_target}-binutils" 'cloog' 'ppl')
-makedepends=("cross-${_target}-glibc-headers"
-             "cross-${_target}-gcc-core")
-options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
-source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('028115c4fbfb6cfd75d6369f4a90d87e')
-
-build() {
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-  mkdir ${_target}
-
-#  Copy headers for libgcc2
-  cp -av /usr/${_target}/usr/include ${_target}/include
-
-    CC_FOR_BUILD=${CHOST}-gcc \
-    CFLAGS=" -pipe " \
-    LDFLAGS= \
-    ${srcdir}/${_pkgname}-${pkgver}/configure \
-        --build=${CHOST} \
-        --host=${CHOST} \
-        --target=${_target} \
-        --prefix=/usr \
-        --with-local-prefix=${_sysroot} \
-        --disable-multilib \
-        --disable-libmudflap \
-        --with-sysroot=${_sysroot} \
-        --enable-shared \
-        --with-arch=loongson2f \
-        --with-abi=n32 \
-        --enable-__cxa_atexit \
-        --with-gmp \
-        --with-mpfr \
-        --with-mpc \
-        --with-ppl \
-        --enable-cloog-backend=isl \
-        --with-libelf \
-        --enable-lto \
-        --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
-        --enable-target-optspace \
-        --disable-libgomp \
-        --disable-libmudflap \
-        --disable-nls \
-        --enable-languages=c
-
-    msg2 "Configuring gcc and libgcc"
-    make ${MAKEFLAGS} configure-gcc configure-libcpp configure-build-libiberty
-
-    msg2 "Making libcpp and libiberty"
-    make ${MAKEFLAGS} all-libcpp all-build-libiberty
-
-    msg2 "Configuring libdecnumber"
-    make ${MAKEFLAGS} configure-libdecnumber
-
-    msg2 "Making libdecnumber"
-    make ${MAKEFLAGS} -C libdecnumber libdecnumber.a 
-
-    msg2 "Making mvars"
-    make ${MAKEFLAGS} -C gcc libgcc.mvars
-
-# Remove -lc since we don't have it yet
-    sed -r -i -e 's@-lc@@g' gcc/libgcc.mvars
-
-    msg2 "Making gcc and libgcc"
-    make ${MAKEFLAGS} all-gcc all-target-libgcc
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-build
-	
-	make ${MAKEFLAGS} DESTDIR=${pkgdir} install-gcc install-target-libgcc
-
-    rm -r ${pkgdir}/usr/share
-}
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
deleted file mode 100644
index 831236d42..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# Contributor: Nicolás Reynolds <fauno@parabola.nu>
-# Contributor (mipsel): Vojtech Horky <vojta . horky at-symbol seznam . cz>
-# This package is used to bootstrap a cross glibc and full featured cross gcc
-# Change the following variables to match your target
-_pkgname=gcc
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-_ARCH=mips
-
-unset LDFLAGS CFLAGS CXXFLAGS
-
-pkgname=cross-${_target}-gcc-core
-pkgver=4.6.2
-pkgrel=8
-pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (static version)"
-url="http://www.gnu.org/software/binutils/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libmpc' 'sh' "${_target}-binutils" 'cloog' 'ppl')
-options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
-source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('028115c4fbfb6cfd75d6369f4a90d87e')
-
-build() {
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  CC_FOR_BUILD=${CHOST}-gcc \
-  CFLAGS=" -pipe " \
-  LDFLAGS= \
-	${srcdir}/${_pkgname}-${pkgver}/configure \
-        --build=${CHOST} \
-        --host=${CHOST} \
-        --target=${_target} \
-        --prefix=/usr \
-        --with-local-prefix=${_sysroot} \
-        --disable-multilib \
-        --disable-libmudflap \
-        --with-sysroot=${_sysroot} \
-        --with-newlib \
-        --enable-threads=no \
-        --disable-shared \
-        --with-arch=loongson2f \
-        --with-abi=n32 \
-        --enable-__cxa_atexit \
-        --with-gmp \
-        --with-mpfr \
-        --with-mpc \
-        --with-ppl \
-        --enable-cloog-backend=isl \
-        --enable-lto \
-        --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
-        --enable-target-optspace \
-        --disable-libgomp \
-        --disable-libmudflap \
-        --disable-nls \
-        --enable-languages=c \
-        --with-libs \
-        --with-headers
-
-    make ${MAKEFLAGS} all-gcc
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-build
-	
-	make ${MAKEFLAGS} DESTDIR=${pkgdir} install-gcc
-
-    rm -r ${pkgdir}/usr/share
-}
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
deleted file mode 100644
index e4b91c652..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Contributor: Vojtech Horky <vojta . horky at-symbol seznam . cz>
-_pkgname=gcc
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/lib/cross-${_target}"
-export PATH=${_sysroot}/bin:/usr/bin/cross/${_target}:$PATH
-
-pkgname=cross-${_target}-gcc
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture"
-url="http://www.gnu.org/software/binutils/"
-arch=('i686' 'x86_64')
-license=('GPL')
-#depends=('libmpc' 'sh' "cross-mips64el-linux-gnu-gcc-base" "cross-${_target}-binutils" "cross-${_target}-glibc" 'cloog' 'ppl')
-depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl')
-options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
-source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-core-${pkgver}.tar.bz2")
-md5sums=('780f614ab18c7a9066dec6387d7490b2')
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-
-        # -march=x86-64 and -mtune=generic don't work on mips64el, we
-        # also want to use -mfix-loongson2f-nop.
-	export CFLAGS_FOR_TARGET="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
-	export CXXFLAGS_FOR_TARGET="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
-
-	./configure \
-		"--prefix=${_sysroot}" \
-		"--bindir=/usr/bin" "--program-prefix=${_target}-" \
-		"--with-sysroot=${_sysroot}" \
-		"--target=${_target}" "--build=$CHOST" "--host=$CHOST" \
-        --enable-shared \
-		--with-gnu-as --with-gnu-ld \
-		--disable-nls --disable-threads \
-		--enable-languages=c \
-		--disable-multilib --disable-libgcj \
-        --enable-cloog-backend=isl
-#		--enable-languages=c,c++,lto,fortran,objc,obj-c++ \
-	make all # -gcc "inhibit_libc=true"
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	make DESTDIR=${pkgdir} install # -gcc
-	
-	msg "Removing duplicit files..."
-	# remove these files as they are already in the system
-	# (with native gcc)
-	rm -Rf ${pkgdir}${_sysroot}/{man,info}
-	# remove conflicting binaries
-	find ${pkgdir}/usr/bin/ -type f -not -name "${_target}-*" -delete
-	
-	msg "Creating out-of-path executables..."
-	# symlink executables to single directory with no-arch-prefix name
-	mkdir -p ${pkgdir}/usr/bin/cross/${_target}/;
-	cd ${pkgdir}/usr/bin/cross/${_target}/;
-	for bin in ${pkgdir}/usr/bin/${_target}-*; do
-		bbin=`basename "$bin"`;
-		ln -s "/usr/bin/${bbin}" `echo "$bbin" | sed "s#^${_target}-##"`;
-	done
-}
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
deleted file mode 100644
index 7fed7839a..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
+++ /dev/null
@@ -1,214 +0,0 @@
-# $Id: PKGBUILD 145917 2012-01-04 01:25:10Z 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
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-_ARCH=mips
-
-unset CFLAGS CXXFLAGS LDFLAGS
-
-pkgname=cross-${_target}-glibc-headers
-pkgver=2.15
-pkgrel=4
-_glibcdate=20111227
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=("${_target}-devel")
-depends=("${_target}-linux-api-headers>=3.1.6" 'tzdata')
-makedepends=("${_target}-binutils"
-             "cross-${_target}-gcc-core")
-options=('!strip')
-install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgname}-${pkgver}_${_glibcdate}.tar.xz
-        http://repo.parabolagnulinux.org/other/glibc-ports-${pkgver}_${_glibcdate}.tar.xz
-        configure.patch
-        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
-        nscd
-        locale.gen.txt
-        locale-gen)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         'a006504b83553d0b554cf8badff005b6'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-mksource() {
-  git clone http://sourceware.org/git/glibc.git
-  pushd glibc
-  #git checkout -b glibc-2.15-arch origin/release/2.15/master
-  git checkout -b glibc-${pkgver}-arch origin/master
-  popd
-  tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
-  mksource-ports
-}
-
-mksource-ports() {
-  tsocks git clone git://sourceware.org/git/glibc-ports.git
-  pushd glibc-ports
-  git checkout -b glibc-${pkgver}-arch origin/release/${pkgver}/master
-  popd
-  tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/*
-}
-
-build() {
-  cd ${srcdir}/glibc
-
- # export PATH=${_sysroot}/bin/:$PATH
-
- # 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
-
-  patch -Np0 -i ${srcdir}/configure.patch
-
-  ln -s ../glibc-ports ports
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  echo "libc_cv_ctors_header=no" >> config.cache
-  echo "libc_cv_forced_unwind=yes" >> config.cache
-  echo "libc_cv_c_cleanup=yes" >> config.cache
-
-   BUILD_CC=${CHOST}-gcc \
-   CFLAGS=" -EL -march=loongson2f -mabi=n32 -O2 -U_FORTIFY_SOURCE " \
-   CC=${_target}-gcc \
-   AR=${_target}-ar \
-   RANLIB=${_target}-ranlib \
-   ${srcdir}/glibc/configure \
-       --prefix=/usr \
-       --build=${CHOST} \
-       --host=${_target} \
-       --without-cvs \
-       --disable-profile \
-       --without-gd \
-       --with-headers=/usr/${_target}/usr/include \
-       --cache-file=${srcdir}/glibc-build/config.cache \
-       --disable-debug \
-       --disable-sanity-checks \
-       --enable-kernel=2.6.27 \
-       --with-__thread \
-       --with-tls \
-       --enable-shared \
-       --with-fp \
-       --enable-add-ons=nptl,ports
-
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  headers_dir=${pkgdir}${_sysroot}/usr/include
-
-  make ${MAKEFLAGS} install_root=${pkgdir}${_sysroot} all-bootstrap-headers=yes install-headers
-
-  msg "Installing some headers manually"
-  mkdir -p "${headers_dir}/gnu"
-  touch "${headers_dir}/gnu/stubs.h"
-  cp -v "${srcdir}/glibc/include/features.h" "${headers_dir}/features.h"
-  cp -v bits/stdio_lim.h "${headers_dir}/bits/stdio_lim.h"
-
-  mkdir -p ${pkgdir}${_sysroot}/usr/lib
-
-  make csu/subdir_lib
-  cp csu/crt1.o csu/crti.o csu/crtn.o ${pkgdir}${_sysroot}/usr/lib
-
-  ${_target}-gcc -nostdlib \
-                 -nostartfiles    \
-                 -shared          \
-                 -x c /dev/null   \
-                 -o ${pkgdir}${_sysroot}/usr/lib/libc.so
-
-# This will help gcc-shared to find headers for libgcc2
-  msg2 "Symlinking headers"
-#  rm -r ${pkgdir}${_sysroot}/include
-  ln -s ${_sysroot}/usr/include ${pkgdir}${_sysroot}/include
-  ln -s ${_sysroot}/usr/lib/crt1.o ${pkgdir}${_sysroot}/lib/
-  ln -s ${_sysroot}/usr/lib/crti.o ${pkgdir}${_sysroot}/lib/
-  ln -s ${_sysroot}/usr/lib/crtn.o ${pkgdir}${_sysroot}/lib/
-  ln -s ${_sysroot}/usr/lib/libc.so ${pkgdir}${_sysroot}/lib/
-
-}
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '98d028ee63fca2821414ebcac0af0e5b'
-         '39f80ba6bcda6b010a66f9c61e9a0017'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/configure.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/configure.patch
deleted file mode 100644
index 5393ae5cd..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure	2011-12-18 02:53:21.000000000 -0300
-+++ configure	2012-01-14 15:20:13.737901264 -0300
-@@ -7210,13 +6940,14 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc_builtin_expect" >&5
- $as_echo "$libc_cv_gcc_builtin_expect" >&6; }
--if test "$libc_cv_gcc_builtin_expect" = no; then
--  as_fn_error $? "support for __builtin_expect needed" "$LINENO" 5
-+if test "$libc_cv_gcc_builtin_expect" = yes; then
-+  $as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
-+
- fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memset" >&5
- $as_echo_n "checking for __builtin_memset... " >&6; }
--if ${libc_cv_gcc_builtin_memset+:} false; then :
-+if ${libc_cv_gcc_builtin_memset+:} false;  then :
-   $as_echo_n "(cached) " >&6
- else
-   cat > conftest.c <<\EOF
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-bz4781.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-dont-build-timezone.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-libdl-crash.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reexport-rpc-interface.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reinstall-nis-rpc-headers.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-revert-4768ae77.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-lddebug-scopes.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-math64crash.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-c5a0802a.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc.install b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale-gen b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale.gen.txt b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/nscd b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/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/cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD b/cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD
deleted file mode 100644
index 24125950f..000000000
--- a/cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Vojtech Horky <vojta . horky at-symbol seznam . cz>
-pkgname=cross-mipsel-linux-gnu-binutils
-_pkgname=binutils
-_target="mipsel-linux-gnu"
-pkgver=2.22
-pkgrel=1
-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")
-_sysroot="/usr/lib/cross-${_target}"
-md5sums=('ee0f10756c84979622b992a4a61ea3f5')
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	./configure \
-		"--prefix=${_sysroot}" \
-		"--bindir=/usr/bin" "--program-prefix=${_target}-" \
-		"--with-sysroot=${_sysroot}" \
-		"--target=${_target}" "--build=$CHOST" "--host=$CHOST" \
-		"--disable-nls" \
-		--with-gcc --with-gnu-as --with-gnu-ld \
-		--without-included-gettext
-		
-	make all
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	make DESTDIR=${pkgdir} install
-	
-	msg "Removing duplicit files..."
-	# remove these files as they are already in the system
-	# (with native binutils)
-	rm -Rf ${pkgdir}${_sysroot}/share/{man,info}
-	# remove conflicting binaries
-	find ${pkgdir}/usr/bin/ -type f -not -name 'mipsel-linux-gnu-*' -delete
-	
-	msg "Creating out-of-path executables..."
-	# symlink executables to single directory with no-arch-prefix name
-	mkdir -p ${pkgdir}/usr/bin/cross/${_target}/;
-	cd ${pkgdir}/usr/bin/cross/${_target}/;
-	for bin in ${pkgdir}/usr/bin/${_target}-*; do
-		bbin=`basename "$bin"`;
-		ln -s "/usr/bin/${bbin}" `echo "$bbin" | sed "s#^${_target}-##"`;
-	done
-}
diff --git a/cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD b/cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD
deleted file mode 100644
index f2d9b2e8b..000000000
--- a/cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Contributor: Vojtech Horky <vojta . horky at-symbol seznam . cz>
-pkgname=cross-mipsel-linux-gnu-gcc
-_pkgname=gcc
-_target="mipsel-linux-gnu"
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="The GNU Compiler Collection for the MIPS architecture"
-url="http://www.gnu.org/software/binutils/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl')
-options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
-source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-core-${pkgver}.tar.bz2")
-md5sums=('b1957f3209080b2f55bc3756d3a62b7c')
-_sysroot="/usr/lib/cross-${_target}"
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	./configure \
-		"--prefix=${_sysroot}" \
-		"--bindir=/usr/bin" "--program-prefix=${_target}-" \
-		"--with-sysroot=${_sysroot}" \
-		"--target=${_target}" "--build=$CHOST" "--host=$CHOST" \
-		--with-gnu-as --with-gnu-ld \
-		--disable-nls --disable-threads \
-		--enable-languages=c,c++ \
-		--disable-multilib --disable-libgcj \
-		--without-headers --disable-shared
-	
-	make all-gcc "inhibit_libc=true"
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	make DESTDIR=${pkgdir} install-gcc
-	
-	msg "Removing duplicit files..."
-	# remove these files as they are already in the system
-	# (with native gcc)
-	rm -Rf ${pkgdir}${_sysroot}/{man,info}
-	# remove conflicting binaries
-	find ${pkgdir}/usr/bin/ -type f -not -name "${_target}-*" -delete
-	
-	msg "Creating out-of-path executables..."
-	# symlink executables to single directory with no-arch-prefix name
-	mkdir -p ${pkgdir}/usr/bin/cross/${_target}/;
-	cd ${pkgdir}/usr/bin/cross/${_target}/;
-	for bin in ${pkgdir}/usr/bin/${_target}-*; do
-		bbin=`basename "$bin"`;
-		ln -s "/usr/bin/${bbin}" `echo "$bbin" | sed "s#^${_target}-##"`;
-	done
-}
diff --git a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
deleted file mode 100644
index 0349036ec..000000000
--- a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ /dev/null
@@ -1,53 +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=${_target}-binutils
-pkgver=2.22
-pkgrel=1
-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')
-provices=("cross-${pkgname}")
-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}
-# Compat symlinks
-    ln -s ${_sysroot}/usr/lib ${pkgdir}${_sysroot}/lib
-    ln -s ${_sysroot}/lib ${pkgdir}${_sysroot}/lib32
-	
-	make DESTDIR=${pkgdir} install
-
-    rm -r ${pkgdir}/usr/{lib,share}
-
-# Create include dir so gcc-core doesn't complain
-    mkdir -p ${pkgdir}${_sysroot}/usr/include
-}
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD
deleted file mode 100644
index 975db9f9d..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD
+++ /dev/null
@@ -1,292 +0,0 @@
-# $Id: PKGBUILD 145914 2012-01-04 01:24:56Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-_pkgname=gcc
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-_ARCH=mips
-
-unset LDFLAGS CFLAGS CXXFLAGS
-
-# Split package names must be changed manually
-pkgname=("${_target}-gcc" "${_target}-gcc-libs" "${_target}-gcc-fortran" "${_target}-gcc-objc") # "gcc-ada" "gcc-go")
-pkgver=4.6.2
-pkgrel=5
-_snapshot=4.6-20111223
-_libstdcppmanver=20111215		# Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection for MIPS/Loongson2f processors"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=("${_target}-binutils>=2.22" "libmpc" "cloog" "ppl"
-             "cross-${_target}-gcc-core-shared"
-             "${_target}-glibc")
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs' '!strip')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64.patch
-    gcc_mips64el_lib.patch
-	gcc-hash-style-both.patch)
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-   if [ ${NOEXTRACT} -eq 0 ]; then
-      cd ${_basedir}
-
-      # Do not install libiberty
-      sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-      # Do not run fixincludes
-      sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-      if [ "${CARCH}" = "x86_64" ]; then
-        patch -Np1 -i ${srcdir}/gcc_pure64.patch
-      fi
-      patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-      patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch
-
-      echo ${pkgver} > gcc/BASE-VER
-
-      mkdir ${srcdir}/gcc-build
-  fi
-
-  cd ${srcdir}/gcc-build
-
-  CC_FOR_BUILD=${CHOST}-gcc \
-  CFLAGS=" -pipe " \
-  LDFLAGS= \
-  CFLAGS_FOR_TARGET=" -EL -march=loongson2f -mabi=n32 " \
-  CXXFLAGS_FOR_TARGET=" -EL -march=loongson2f -mabi=n32 " \
-  LDFLAGS_FOR_TARGET=" -EL " \
-  ${_basedir}/configure --prefix=/usr \
-      --build=${CHOST} \
-      --host=${CHOST} \
-      --target=${_target} \
-      --libexecdir=/usr/lib \
-      --with-sysroot=${_sysroot} \
-      --with-arch=loongson2f \
-      --with-abi=n32 \
-      --with-bugurl=https://bugs.parabolagnulinux.org/ \
-      --enable-languages=c,c++,fortran,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 \
-      --disable-multilib \
-      --disable-libssp \
-      --disable-libstdcxx-pch \
-      --enable-checking=release
-
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-
-package_mips64el-unknown-linux-gnu-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC"
-  groups=("${_target}-devel")
-  depends=("${_target}-glibc>=2.14")
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C ${_target}/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $_target/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $_target/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $_target/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}${_sysroot}/usr/lib{,32}/{gcc/,libgfortran.spec}
-
-  rm -rf ${pkgdir}/usr/share
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/${_target}-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_mips64el-unknown-linux-gnu-gcc()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("${_target}-gcc-libs=$pkgver-$pkgrel" "${_target}-binutils>=2.22" 'libmpc' 'cloog' 'ppl')
-  groups=("${_target}-devel")
-  replaces=("cross-${_target}-gcc-core"
-            "cross-${_target}-gcc-core-shared")
-  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 -rf ${pkgdir}/usr/share
-
-  rm -f $pkgdir/usr/bin/{{$_target-,}gfortran,{$_target-,}gccgo,gnat*}
-  rm -f $pkgdir${_sysroot}/lib{,32}/*.so*
-  rm -f $pkgdir${_sysroot}/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm -f $pkgdir${_sysroot}/lib{,32}/libgfortran.spec
-  rm -rf $pkgdir/usr/lib{,32}/gcc/$_target/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm -f $pkgdir/usr/lib{,32}/gcc/$_target/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm -f $pkgdir/usr/lib{,32}/gcc/$_target/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
-  rm -rf $pkgdir/usr/lib{,32}/go
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/${_target}-cpp
-  ln -sf ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc
-  ln -sf ${_target}-g++ ${pkgdir}/usr/bin/${_target}-c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$_target/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$_target/${pkgver}/
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/${_target}-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 mips64el-unknown-linux-gnu-gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/${_target}-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 mips64el-unknown-linux-gnu-gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/${_target}-c{8,9}9
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/${_target}-gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_mips64el-unknown-linux-gnu-gcc-fortran()
-{
-  pkgdesc="Fortran front-end for GCC"
-  depends=("${_target}-gcc=$pkgver-$pkgrel")
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $_target/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/$_target/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm -f ${pkgdir}${_sysroot}/lib{,32}/lib{gfortran,quadmath}.so*
-  rm -fr ${pkgdir}/usr/share
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/${_target}-gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_mips64el-unknown-linux-gnu-gcc-objc()
-{
-  pkgdesc="Objective-C front-end for GCC"
-  depends=("${_target}-gcc=$pkgver-$pkgrel")
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$_target/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$_target/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm -f ${pkgdir}${_sysroot}/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/${_target}-gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
-  pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("${_target}-gcc=$pkgver-$pkgrel")
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$_target/$pkgver
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
-  pkgdesc="Go front-end for GCC"
-  depends=("${_target}-gcc=$pkgver-$pkgrel")
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$_target/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
-         '450772ce32daed97d7383199f8797f33'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '67e337993d821d72fccacbed52d48c34'
-         '4df25b623799b148a0703eaeec8fdf3f')
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
deleted file mode 100644
index 18de66776..000000000
--- a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
+++ /dev/null
@@ -1,309 +0,0 @@
-# $Id: PKGBUILD 145917 2012-01-04 01:25:10Z 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
-
-# NOTE: I had to run this after installing target-glibc to build target-gcc:
-# for lib in /usr/${_target}/usr/lib/*; do
-# ln -s ${lib} /usr/${_target}/lib/$(basename ${lib}
-# done
-# gcc build should probably add a -B flag to usr/lib instead
-
-_pkgname=glibc
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-_ARCH=mips
-
-# Disable this after building final gcc
-# Otherwise you'll get ld: missing libc.so errors
-BOOTSTRAPING=true
-
-unset CFLAGS CXXFLAGS LDFLAGS
-
-pkgname=${_target}-glibc
-pkgver=2.15
-pkgrel=2
-_glibcdate=20111227
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=("${_target}-devel")
-depends=("${_target}-linux-api-headers>=3.1.6" 'tzdata')
-makedepends=("${_target}-binutils"
-             "cross-${_target}-gcc-core-shared"
-             "cross-${_target}-glibc-headers")
-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
-        http://repo.parabolagnulinux.org/other/glibc-ports-${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
-        configure.patch
-        nscd
-        locale.gen.txt
-        locale-gen)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         'a006504b83553d0b554cf8badff005b6'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-mksource() {
-  git clone http://sourceware.org/git/glibc.git
-  pushd glibc
-  #git checkout -b glibc-2.15-arch origin/release/2.15/master
-  git checkout -b glibc-${pkgver}-arch origin/master
-  popd
-  tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
-  mksource-ports
-}
-
-mksource-ports() {
-  git clone http://sourceware.org/git/glibc-ports.git
-  pushd glibc-ports
-  git checkout -b glibc-${pkgver}-arch origin/release/${pkgver}/master
-  popd
-  tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/*
-}
-
-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
-
-  patch -Np0 -i ${srcdir}/configure.patch
-
-  install -dm755 ${pkgdir}${_sysroot}/etc
-  touch ${pkgdir}${_sysroot}/etc/ld.so.conf
-
-  ln -s ../glibc-ports ports
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  echo "slibdir=/lib" >> configparms
-  echo "libc_cv_ctors_header=no" >> config.cache
-  echo "libc_cv_forced_unwind=yes" >> config.cache
-  echo "libc_cv_c_cleanup=yes" >> config.cache
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-    BUILD_CC=${CHOST}-gcc \
-    CFLAGS=" -EL -march=loongson2f -mabi=n32 -O2 -U_FORTIFY_SOURCE " \
-    CC=${_target}-gcc \
-    AR=${_target}-ar \
-    RANLIB=${_target}-ranlib \
-    ${srcdir}/glibc/configure \
-        --prefix=/usr \
-        --cache-file=${srcdir}/glibc-build/config.cache \
-        --build=${CHOST} \
-        --host=${_target} \
-        --without-cvs \
-        --disable-profile \
-        --without-gd \
-        --with-headers=/usr/${_target}/usr/include \
-        --disable-debug \
-        --disable-sanity-checks \
-        --enable-kernel=2.6.27 \
-        --with-__thread \
-        --with-tls \
-        --enable-shared \
-        --with-fp \
-        --enable-add-ons=nptl,ports,libidn \
-        --enable-bind-now \
-        --enable-multi-arch
-
-      #  --libdir=${_sysroot}/usr/lib \
-      #  --libexecdir=${_sysroot}/usr/lib \
-  
-  # 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}${_sysroot} install
-
-  rm -f ${pkgdir}${_sysroot}/etc/ld.so.{cache,conf}
-
-# Compat symlinks
-  ln -s ${_sysroot}/usr/lib ${pkgdir}${_sysroot}/lib
-  ln -s ${_sysroot}/lib ${pkgdir}${_sysroot}/lib32
-
-# Fix libc.so to find correct libraries
-  if ${BOOTSTRAPING}; then
-      sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libc.so
-      sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthreads.so
-  fi
-
-  install -dm755 ${pkgdir}${_sysroot}/etc/rc.d
-  install -dm755 ${pkgdir}${_sysroot}/usr/sbin
-  install -dm755 ${pkgdir}${_sysroot}/usr/lib/locale
-  install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}${_sysroot}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd ${pkgdir}${_sysroot}/etc/rc.d/nscd
-  install -m755 ${srcdir}/locale-gen ${pkgdir}${_sysroot}/usr/sbin
-  install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}${_sysroot}/etc/gai.conf
-
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}${_sysroot}/etc/nscd.conf
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}${_sysroot}/etc/locale.gen
-  sed -e "s|/| |g" \
-      -e 's|\\| |g' \
-      -e "s|SUPPORTED-LOCALES=||" \
-      ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}${_sysroot}/etc/locale.gen
-  sed -i "s|^|#|g" ${pkgdir}${_sysroot}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix for the linker
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}${_sysroot}/bin/ldd
-    # Comply with multilib binaries, they look for the linker in /lib64
-    mkdir ${pkgdir}${_sysroot}/lib64
-    cd ${pkgdir}${_sysroot}/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${_sysroot}
-# ${_target}-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
-
-# ${_target}-strip $STRIP_STATIC usr/lib/*.a
-
-# ${_target}-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}
-}
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '98d028ee63fca2821414ebcac0af0e5b'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '98d028ee63fca2821414ebcac0af0e5b'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
-         '39f80ba6bcda6b010a66f9c61e9a0017'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/glibc.install b/cross/mips64el-unknown-linux-gnu-glibc/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/locale-gen b/cross/mips64el-unknown-linux-gnu-glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt b/cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-glibc/nscd b/cross/mips64el-unknown-linux-gnu-glibc/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/cross/mips64el-unknown-linux-gnu-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/cross/mips64el-unknown-linux-gnu-linux-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-api-headers/PKGBUILD
deleted file mode 100644
index 277890098..000000000
--- a/cross/mips64el-unknown-linux-gnu-linux-api-headers/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 145918 2012-01-04 01:25:12Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-export ARCH=mips
-_target=mips64el-unknown-linux-gnu
-_sysroot="/usr/${_target}"
-
-pkgname=${_target}-linux-api-headers
-pkgver=3.1.6
-_basekernel=3.1
-pkgrel=2
-pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL2')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz")
-md5sums=('d73df15ab1d36fe3c102755d8f42117f'
-         'cb42276bca126c676c51d02d74bf7fe7')
-
-build() {
-  cd "${srcdir}/linux-${_basekernel}"
-
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
-  fi
-
-  make mrproper
-  make headers_check
-}
-
-package() {
-  cd "${srcdir}/linux-${_basekernel}"
-  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}${_sysroot}/usr headers_install
-}
diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD
index 32f5db368..1fa27c798 100644
--- a/elementary/gtk-engine-equinox/PKGBUILD
+++ b/elementary/gtk-engine-equinox/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A heavily modified version of the beautiful Aurora engine"
 url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2')
 makedepends=('pkgconfig')
 conflicts=()
diff --git a/elementary/postler/PKGBUILD b/elementary/postler/PKGBUILD
index 55b523f82..38a5d9a0d 100644
--- a/elementary/postler/PKGBUILD
+++ b/elementary/postler/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=postler
 pkgver=0.1.1
 pkgrel=2
 pkgdesc="Postler is simple desktop mail client built in vala"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/postler"
 license=('GPL')
 depends=('libwebkit' 'libunique' 'libcanberra' 'libnotify')
diff --git a/elementary/vala-010/PKGBUILD b/elementary/vala-010/PKGBUILD
index 7712f99c4..aad2232fe 100644
--- a/elementary/vala-010/PKGBUILD
+++ b/elementary/vala-010/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=vala
 pkgver=0.10.4
 pkgrel=1
 pkgdesc="Compiler for the GObject type system (0.10 branch)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Vala"
 license=('LGPL2.1')
 depends=('glib2')
diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index ae316078b..b1fa5191c 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=a2ps
 pkgver=4.14
 pkgrel=2
 pkgdesc="An Any to PostScript filter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
 depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index a5743a79e..581b0abd1 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.7.4
 pkgrel=5
 pkgdesc="A free library for decoding ATSC A/52 streams"
 url="http://liba52.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc')
 options=(!libtool)
@@ -21,7 +21,8 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch"
   ./bootstrap
-  ./configure --prefix=/usr --enable-shared
+  ./configure --prefix=/usr --enable-shared \
+              --build=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD
index d86d8220c..778065b21 100644
--- a/extra/aalib/PKGBUILD
+++ b/extra/aalib/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=aalib
 pkgver=1.4rc5
-pkgrel=8
+pkgrel=8.1
 pkgdesc="A portable ASCII art graphic library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aa-project.sourceforge.net/aalib/"
 license=('LGPL')
 depends=('glibc' 'ncurses' 'gpm' 'libx11')
@@ -20,7 +20,7 @@ sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b' '98d8c5a13672a8107945d694ff
 build() {
   cd "${srcdir}/${pkgname}-1.4.0"
   patch -p0 -i "${srcdir}/aclocal-fixes.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --host=$CHOST
   make
 }
 
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
deleted file mode 100644
index 2bb71bb52..000000000
--- a/extra/abiword/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Maël Lavault <moimael@neuf.fr>
-
-pkgbase=abiword
-pkgname=('abiword' 'abiword-plugins')
-pkgver=2.8.6
-pkgrel=6
-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)
-sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
-          'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea'
-          '159b1cd0b9354868ab86f851b64a03dae7d254dc')
-
-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"
-  libtoolize --force
-  autoreconf
-
-  ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere
-  make
-}
-
-package_abiword() {
-  pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
-  install=$pkgname.install
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
-}
-
-package_abiword-plugins() {
-  pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-}
diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/extra/abiword/abiword-2.8.6-no-undefined.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/extra/abiword/abiword.install b/extra/abiword/abiword.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/abiword/abiword.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD
index 33832c165..44f9699b8 100644
--- a/extra/abook/PKGBUILD
+++ b/extra/abook/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=abook
 pkgver=0.6.0pre2
 pkgrel=3
 pkgdesc='Text-based addressbook designed for use with Mutt'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://abook.sourceforge.net/'
 license=('GPL2')
 depends=('readline')
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 0222f00e5..69602c83c 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=accountsservice
 pkgver=0.6.15
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://cgit.freedesktop.org/accountsservice/"
 license=('GPL3')
 depends=('dbus-glib' 'polkit')
diff --git a/extra/acpi/PKGBUILD b/extra/acpi/PKGBUILD
index 10d25d391..0014dd64d 100644
--- a/extra/acpi/PKGBUILD
+++ b/extra/acpi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=acpi
 pkgver=1.5
 pkgrel=1
 pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/acpiclient"
 depends=('glibc')
 source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz)
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index ae5cfc9e0..8572d79b1 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=acpid
 pkgver=2.0.14
 pkgrel=1
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tedfelix.com/linux/acpid-netlink.html"
 license=('GPL')
 depends=('bash')
diff --git a/extra/aiksaurus/PKGBUILD b/extra/aiksaurus/PKGBUILD
index ae6b40bc2..7363dc4a6 100644
--- a/extra/aiksaurus/PKGBUILD
+++ b/extra/aiksaurus/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="A cross-platform, open-source thesaurus"
 url="http://aiksaurus.sourceforge.net/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 depends=('gtk2')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index a0f060ca0..314410011 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aisleriot
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="GNOME Solitaire card games"
-arch=(i686 x86_64)
+arch=(mips64el)
 license=(GPL)
 url="http://www.gnome.org"
 groups=('gnome-extra')
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 773c4e06e..f2180a340 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=akonadi
 pkgver=1.7.0
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org/akonadi'
 license=('LGPL')
 depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
@@ -19,6 +19,7 @@ build() {
   cd "${srcdir}"
   mkdir build
   cd build
+  CXX="g++" \
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/alex/PKGBUILD b/extra/alex/PKGBUILD
index 7d1e975ba..1882aaf44 100644
--- a/extra/alex/PKGBUILD
+++ b/extra/alex/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=alex
 pkgver=2.3.5
 pkgrel=1.1
 pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.haskell.org/alex/'
 license=('custom:BSD3')
 depends=('gmp')
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index 9903edb53..db0594f7a 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=allegro
 pkgver=5.0.5
 pkgrel=1
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index b5f7fda08..7fe44ddc0 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=alsa-lib
 pkgver=1.0.24.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An alternative implementation of Linux sound support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsa-project.org"
 depends=('glibc')
 optdepends=('python2: for python smixer plugin')
diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD
index 2d32793d0..213721546 100644
--- a/extra/alsa-oss/PKGBUILD
+++ b/extra/alsa-oss/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=alsa-oss
 pkgver=1.0.17
 pkgrel=2
 pkgdesc="OSS compatibility library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.alsa-project.org"
 options=('!libtool')
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index 93478640d..f1470b1d9 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=alsa-plugins
 pkgver=1.0.24
 pkgrel=3
 pkgdesc="Extra alsa plugins"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.alsa-project.org"
 license=(GPL)
 depends=(alsa-lib)
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index cb8da4e3d..b19663a19 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=alsa-utils
 pkgver=1.0.24.2
 pkgrel=3
 pkgdesc="An alternative implementation of Linux sound support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsa-project.org"
 #can not use >=$pkgver due to use of letters in alsa-lib update versioning
 depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc')
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index ed5a8b546..5b34de65f 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsaplayer.org/"
 license=('GPL')
 depends=('gcc-libs' 'desktop-file-utils')
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index d8f0ce047..b38398183 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -8,7 +8,7 @@ replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
 pkgrel=1
 pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org"
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 3eba571f9..c30eeeefd 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=amule
 pkgver=10708
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index db8a5fc82..93c2775d2 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=anjuta
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD
index c38e8ba48..c0a3fbf9a 100644
--- a/extra/anthy/PKGBUILD
+++ b/extra/anthy/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=9100h
 _filecode=37536
 pkgrel=2
 pkgdesc='Hiragana text to Kana Kanji mixed text Japanese input method'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.jp/projects/anthy/'
 license=('LGPL' 'GPL')
 options=('!libtool')
diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD
index 021da9bb4..b002792bb 100644
--- a/extra/antlr2/PKGBUILD
+++ b/extra/antlr2/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=antlr2
 pkgname=('antlr2' 'python-antlr2')
 pkgver=2.7.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.antlr2.org/"
 license=('custom')
 makedepends=('java-environment' 'python2' 'sh')
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 6f2ee060d..7c1d62c92 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=apache
 pkgver=2.2.21
-pkgrel=1
+pkgrel=1.1
 pkgdesc='A high performance Unix-based HTTP server'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 9d906429e..f08fef652 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=apr-util
 pkgver=1.3.12
 pkgrel=5
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
 depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index 3f18110f0..78753328d 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=apr
 pkgver=1.4.5
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
 depends=('util-linux-ng>=2.16')
 options=('!libtool')
diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD
index 3fbe423f6..36476601c 100644
--- a/extra/apricots/PKGBUILD
+++ b/extra/apricots/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=apricots
 pkgver=0.2.6
 pkgrel=5
 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://www.fishies.org.uk/apricots.html"
 depends=('gcc-libs' 'openal' 'sdl' 'freealut')
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 3f0574d4e..dbae38b33 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=ardour
 pkgver=2.8.12
 pkgrel=1
 pkgdesc="A multichannel hard disk recorder and digital audio workstation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ardour.org/"
 license=('GPL')
 depends=('liblrdf>=0.4.0-8' 'liblo' 'libusb-compat'
diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD
index 7c2b457ca..bf0a734bf 100644
--- a/extra/arj/PKGBUILD
+++ b/extra/arj/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.10.22
 pkgrel=6
 pkgdesc="Free and portable clone of the ARJ archiver"
 url="http://arj.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 options=('!makeflags')
 depends=('glibc')
diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD
index ac4085b60..5ae5a77ba 100644
--- a/extra/arora/PKGBUILD
+++ b/extra/arora/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc='Lightweight cross-platform Web browser'
 url='http://www.arora-browser.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qtwebkit' 'desktop-file-utils')
 source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD
index 952b5e16d..2ff599483 100644
--- a/extra/asio/PKGBUILD
+++ b/extra/asio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=asio
 pkgver=1.4.8
 pkgrel=2
 pkgdesc="Cross-platform C++ library for ASynchronous network I/O"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://asio.sourceforge.net"
 license=('custom')
 depends=('boost')
diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD
index 7d15c7fe8..7346d3070 100644
--- a/extra/aspell-de/PKGBUILD
+++ b/extra/aspell-de/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-de
 pkgver=20110609
 pkgrel=1
 pkgdesc="German dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://j3e.de/ispell/igerman98/index.html"
 license=('GPL2')
 depends=('aspell')
diff --git a/extra/aspell-en/PKGBUILD b/extra/aspell-en/PKGBUILD
index 6ac72bed5..5cbe89c17 100644
--- a/extra/aspell-en/PKGBUILD
+++ b/extra/aspell-en/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=aspell-en
 pkgver=7.1
 pkgrel=1
 pkgdesc="English dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('custom')
 depends=('aspell')
diff --git a/extra/aspell-es/PKGBUILD b/extra/aspell-es/PKGBUILD
index 81a93400e..58827eeda 100644
--- a/extra/aspell-es/PKGBUILD
+++ b/extra/aspell-es/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-es
 pkgver=1.11
 pkgrel=4
 pkgdesc="Spanish dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL')
 depends=('aspell')
diff --git a/extra/aspell-fr/PKGBUILD b/extra/aspell-fr/PKGBUILD
index ef91b7513..8d8a36cf8 100644
--- a/extra/aspell-fr/PKGBUILD
+++ b/extra/aspell-fr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-fr
 pkgver=0.50.3
 pkgrel=5
 pkgdesc="French dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL')
 depends=('aspell')
diff --git a/extra/aspell-hu/PKGBUILD b/extra/aspell-hu/PKGBUILD
index 748f3b129..3afb7f8cb 100644
--- a/extra/aspell-hu/PKGBUILD
+++ b/extra/aspell-hu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=aspell-hu
 pkgver=0.99.4.2
 pkgrel=2
 pkgdesc="Hungarian spellcheck dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL')
 depends=('aspell')
diff --git a/extra/aspell-it/PKGBUILD b/extra/aspell-it/PKGBUILD
index f02041354..f2cb79b8a 100644
--- a/extra/aspell-it/PKGBUILD
+++ b/extra/aspell-it/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=aspell-it
 pkgver=2.2_20050523
 pkgrel=4
 pkgdesc="Italian dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL')
 depends=('aspell')
diff --git a/extra/aspell-nl/PKGBUILD b/extra/aspell-nl/PKGBUILD
index d0bb9a4af..6e5cce482 100644
--- a/extra/aspell-nl/PKGBUILD
+++ b/extra/aspell-nl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-nl
 pkgver=0.50.2
 pkgrel=1
 pkgdesc="Dutch dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('custom')
 depends=('aspell')
diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index 6fac241b7..846abf74a 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -9,7 +9,7 @@ _pkgverBR=20090702
 pkgver=$_pkgverBR
 pkgrel=2
 pkgdesc="Portuguese and Brazilian Portuguese dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL2')
 depends=('aspell')
diff --git a/extra/aspell-ru/PKGBUILD b/extra/aspell-ru/PKGBUILD
index 23b286b01..ed8f25330 100644
--- a/extra/aspell-ru/PKGBUILD
+++ b/extra/aspell-ru/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-ru
 pkgver=0.99f7
 pkgrel=4
 pkgdesc="Russian dictionary for aspell"
-arch=('i686' 'x86_64') #We cannot use 'any' see FS#22443
+arch=('i686' 'x86_64' 'mips64el') #We cannot use 'any' see FS#22443
 url="http://aspell.net/"
 license=('custom')
 depends=('aspell')
diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD
index 1b88938d3..a6e4e621d 100644
--- a/extra/aspell/PKGBUILD
+++ b/extra/aspell/PKGBUILD
@@ -9,8 +9,8 @@ pkgver=0.60.6.1
 _pkgmajorver=0.60
 pkgrel=1
 pkgdesc="A spell checker designed to eventually replace Ispell"
-arch=('i686' 'x86_64')
 url="http://aspell.net/"
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gcc-libs' 'ncurses')
 optdepends=('perl: to import old dictionaries')
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index be43a915c..f4709bf19 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=asymptote
 pkgver=2.15
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://asymptote.sourceforge.net/"
 license=("GPL3")
 depends=('texlive-core' 'gc' 'freeglut' 'gsl' 'fftw')
diff --git a/extra/at-spi/PKGBUILD b/extra/at-spi/PKGBUILD
index 0970c90f4..82cc1b4ec 100644
--- a/extra/at-spi/PKGBUILD
+++ b/extra/at-spi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=at-spi
 pkgver=1.32.0
 pkgrel=4
 pkgdesc="Assistive Technology Service Provider Interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libbonobo' 'libxtst' 'gtk2' 'gconf')
 makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm')
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 6179b042e..726daa06f 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=at-spi2-atk
 pkgver=2.2.2
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index d77a8e8cf..1b42e0166 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=at-spi2-core
 pkgver=2.2.3
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('dbus-core' 'glib2' 'libxtst')
diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD
index 0f6736512..a33b1cea4 100644
--- a/extra/at/PKGBUILD
+++ b/extra/at/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=at
 pkgver=3.1.13
-pkgrel=1
+pkgrel=1.1
 pkgdesc="AT and batch delayed command scheduling utility and daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.qa.debian.org/a/at.html"
 license=('GPL')
 depends=('pam')
diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD
index 0dafc580a..25e2b51e0 100644
--- a/extra/aterm/PKGBUILD
+++ b/extra/aterm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aterm
 pkgver=1.0.1
 pkgrel=3
 pkgdesc="An xterm replacement with transparency support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aterm.sourceforge.net/"
 license=('GPL')
 depends=('libx11')
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index 33b1f015c..728d6a5bb 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=atk
 pkgver=2.2.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('glib2')
 makedepends=('gobject-introspection')
diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD
index 1cb843d48..9bc7244d4 100644
--- a/extra/atkmm/PKGBUILD
+++ b/extra/atkmm/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=atkmm
 pkgname=(atkmm atkmm-docs)
 pkgver=2.22.6
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD
index 0ec114468..276498660 100644
--- a/extra/attica/PKGBUILD
+++ b/extra/attica/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=attica
 pkgver=0.3.0
 pkgrel=1
 pkgdesc='A Qt library that implements the Open Collaboration Services API'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kdesupport/attica'
 license=('LGPL')
 depends=('qt')
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index e172e1fe1..517f756d6 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aubio
 pkgver=0.3.2
 pkgrel=4
 pkgdesc="A library for audio labelling"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aubio.org/"
 license=('GPL')
 depends=('libsamplerate' 'fftw' 'jack')
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 4cd60ea5e..a411aad44 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -9,10 +9,10 @@ pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
 license=('GPL3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
-optdepends=('unzip: zipped skins support')
+optdepends=('unzip-libre: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('3ebc4dcdcf5da960ba400078023e167e02105e84')
 
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 1f03ee557..d340646e6 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=audacity
 pkgver=1.3.14
 pkgrel=2
 pkgdesc="A program that lets you manipulate digital audio waveforms"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://audacity.sourceforge.net/"
 license=('GPL')
 depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme'
diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD
index 75624cdea..2c937221d 100644
--- a/extra/audiofile/PKGBUILD
+++ b/extra/audiofile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=audiofile
 pkgver=0.3.2
 pkgrel=1
 pkgdesc="Silicon Graphics Audio File Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.68k.org/~michael/audiofile/"
 license=('LGPL')
 depends=('gcc-libs' 'alsa-lib')
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index b98ddacc7..fa335c045 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=autogen
 pkgver=5.12
 pkgrel=1
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://autogen.sourceforge.net/"
 license=('GPL3')
 depends=('guile' 'libxml2')
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index a6f7bc58d..2d0f8dc7c 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=automoc4
 pkgver=0.9.88
 pkgrel=2
 pkgdesc="Automatic moc for Qt4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('custom')
 depends=('qt')
diff --git a/extra/autopano-sift-c/PKGBUILD b/extra/autopano-sift-c/PKGBUILD
index 35a5d7fdc..69a9432f2 100644
--- a/extra/autopano-sift-c/PKGBUILD
+++ b/extra/autopano-sift-c/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=autopano-sift-c
 pkgver=2.5.1
 pkgrel=2
 pkgdesc="Identify key feature points within arbitrary images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
 license=('GPL2')
 depends=('libxml2' 'libpano13>=2.9.17' 'gcc-libs')
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 1d5f9ccc9..e35aa24b8 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -6,10 +6,11 @@ pkgname=avahi
 pkgver=0.6.30
 pkgrel=6
 pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+[ "$CARCH" = "mips64el" ] || {
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
             'qt3: qt3 bindings'
@@ -21,6 +22,19 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+}
+
+[ "$CARCH" = "mips64el" ] && {
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+            'gtk2: gtk2 bindings'
+            'qt: qt bindings'
+            'pygtk: avahi-bookmarks, avahi-discover'
+            'twisted: avahi-bookmarks'
+            'dbus-python: avahi-discover'
+            'nss-mdns: NSS support for mDNS')
+makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
+             'gobject-introspection' 'gtk3')
+}
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=install
 conflicts=('howl' 'mdnsresponder')
@@ -40,6 +54,9 @@ build() {
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
 	patch -p1 -i "../rc.d.patch"
 
+  [ "$CARCH" = "mips64el" ] && \
+    extra="--disable-qt3 --disable-mono"
+
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
 	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
@@ -57,6 +74,7 @@ build() {
 		--with-avahi-priv-access-group=network \
 		--with-autoipd-user=avahi \
 		--with-autoipd-group=avahi \
+    $extra \
 		--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
 
 	make
diff --git a/extra/avfs/PKGBUILD b/extra/avfs/PKGBUILD
index a647b1185..288312c7a 100644
--- a/extra/avfs/PKGBUILD
+++ b/extra/avfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=avfs
 pkgver=0.9.9
 pkgrel=1
 pkgdesc="A virtual filesystem which enables programs to look inside archived or compressed files, or access remote files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://avf.sourceforge.net/"
 source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index fe1ad2144..256124e05 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index e73bdd8f0..aad64d103 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=avogadro
 pkgver=1.0.3
 pkgrel=4
 pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
 depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD
index 2c37a8c36..45f2d5cef 100644
--- a/extra/babl/PKGBUILD
+++ b/extra/babl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=babl
 pkgver=0.1.6
 pkgrel=1
 pkgdesc="Dynamic, any to any, pixel format conversion library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gegl.org/babl/"
 license=('LGPL3')
 depends=('glibc')
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 79a6d8ac0..8e94c989e 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=banshee
 pkgver=2.2.1
 pkgrel=1
 pkgdesc="Music management and playback for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://banshee.fm/"
 license=('MIT')
 depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins notify-sharp-svn dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gtk-sharp-beans 'gudev-sharp' 'gkeyfile-sharp' gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info)
diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD
index b69e764d5..799943f59 100644
--- a/extra/barcode/PKGBUILD
+++ b/extra/barcode/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=barcode
 pkgver=0.98
 pkgrel=4
 pkgdesc="A tool to convert text strings to printed bars"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/barcode/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD
index 0ad964ea1..8887cd7ca 100644
--- a/extra/basket/PKGBUILD
+++ b/extra/basket/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=basket
 pkgver=1.81
 pkgrel=1
 pkgdesc="All-purpose notes taker for KDE."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://basket.kde.org/"
 depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD
index 96ab3239b..7723696ae 100644
--- a/extra/bc/PKGBUILD
+++ b/extra/bc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bc
 pkgver=1.06
 pkgrel=8
 pkgdesc="An arbitrary precision calculator language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/bc/"
 license=('GPL')
 depends=('readline')
diff --git a/extra/beep/PKGBUILD b/extra/beep/PKGBUILD
index bee2afc6d..f7a9853ea 100644
--- a/extra/beep/PKGBUILD
+++ b/extra/beep/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=beep
 pkgver=1.3
 pkgrel=1
 pkgdesc="Advanced PC speaker beeping program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.johnath.com/beep"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index 4ceec50e9..664c29d51 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bftpd
 pkgver=3.6
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://bftpd.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'pam')
diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD
index 62edcf962..dddf5cf4b 100644
--- a/extra/bigloo/PKGBUILD
+++ b/extra/bigloo/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=3.7a-2
 pkgver=${_pkgver/-/_}
 pkgrel=1
 pkgdesc="Fast scheme compiler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"
 license=('GPL' 'LGPL')
 depends=('openssl' 'sqlite3' 'alsa-lib')
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index b80c5a332..b9acf0d7d 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -13,7 +13,7 @@ pkgrel=1
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'krb5' 'libxml2')
 options=('!makeflags' '!libtool')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index bf86e27d1..2153ff5ad 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -12,7 +12,7 @@ pkgrel=3
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'glib2')
 makedepends=('asciidoc' 'libotr')
 optdepends=('skype4py: to use skyped'
@@ -39,8 +39,7 @@ build() {
 		--systemdsystemunitdir=/lib/systemd/system \
 		--ssl=openssl \
 		--strip=0 \
-		--otr=plugin \
-		--skype=plugin \
+		--otr=plugin
 
 	make
 }
diff --git a/extra/blas/PKGBUILD b/extra/blas/PKGBUILD
index 872e57bc7..cf6369fed 100755
--- a/extra/blas/PKGBUILD
+++ b/extra/blas/PKGBUILD
@@ -11,7 +11,7 @@ url="http://www.netlib.org/blas"
 makedepends=('gcc-fortran')
 depends=('gcc-libs')
 pkgdesc="Basic Linear Algebra Subprograms"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://www.netlib.org/lapack/lapack-${pkgver}.tgz
         lapack-3.1.1-make.inc.patch
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index d0cf8b899..ad2437496 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bluedevil
 pkgver=1.2.2
 pkgrel=1
 pkgdesc='KDE bluetooth framework'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://projects.kde.org/projects/extragear/base/bluedevil"
 license=('GPL')
 depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index fcf9f4d25..08276d872 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bluefish
 pkgver=2.2.1
 pkgrel=1
 pkgdesc="A powerful HTML editor for experienced web designers and programmers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bluefish.openoffice.nl/"
 license=('GPL3')
 depends=('gtk3' 'enchant' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD
index 529b49642..f3d91a738 100644
--- a/extra/bluez-hcidump/PKGBUILD
+++ b/extra/bluez-hcidump/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.2
 pkgrel=1
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('bluez')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index be653c012..4c901a565 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.98
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('dbus-core')
 makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile')
diff --git a/extra/bmp-musepack/PKGBUILD b/extra/bmp-musepack/PKGBUILD
index 408e4113d..0cde321fb 100644
--- a/extra/bmp-musepack/PKGBUILD
+++ b/extra/bmp-musepack/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bmp-musepack
 pkgver=1.2
 pkgrel=4
 pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musepack.net/"
 license=('BSD')
 depends=('bmp' 'libmpcdec' 'taglib')
diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD
index bf2deef41..55449d66f 100644
--- a/extra/bmp-wma/PKGBUILD
+++ b/extra/bmp-wma/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=4
 pkgdesc="WMA plugin for Beep Media Player"
 url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
 license=('GPL')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('bmp')
 groups=('bmp-plugins' 'bmp-io-plugins')
 options=('!libtool' '!emptydirs')
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
index 50bbb6257..ea646f637 100644
--- a/extra/bmp/PKGBUILD
+++ b/extra/bmp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bmp
 pkgver=0.9.7.1
 pkgrel=8
 pkgdesc="gtk2 port of xmms"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 mips64el)
 url="http://sourceforge.net/projects/beepmp/"
 license=('GPL')
 depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD
index 0e4920fe7..46bc1161d 100644
--- a/extra/bochs/PKGBUILD
+++ b/extra/bochs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bochs
 pkgver=2.4.6
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://bochs.sourceforge.net/"
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD
index 018f70a54..371204ff4 100644
--- a/extra/bogofilter/PKGBUILD
+++ b/extra/bogofilter/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bogofilter
 pkgver=1.2.2
 pkgrel=4
 pkgdesc="A fast Bayesian spam filtering tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl')
diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD
index b9fcee689..c630d2d8c 100644
--- a/extra/boo/PKGBUILD
+++ b/extra/boo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=boo
 pkgver=0.9.4.9
 pkgrel=1
 pkgdesc="A wrist friendly language for the CLI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://boo.codehaus.org/"
 license=('GPL')
 depends=('sh' 'mono' 'shared-mime-info')
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 8efad5ecc..d55e68456 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -8,8 +8,8 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.48.0
 _boostver=${pkgver//./_}
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgrel=3
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
@@ -42,6 +42,7 @@ build() {
 
   _bindir="bin.linuxx86"
   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+  [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips"
 
   install -d "${_stagedir}"/usr/bin
   install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD
index 525f79992..5b21ffbe5 100644
--- a/extra/botan/PKGBUILD
+++ b/extra/botan/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.10.1
 pkgrel=1
 pkgdesc="BSD-licensed crypto library written in C++"
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://botan.randombit.net/"
 depends=('gcc-libs' 'sh')
 makedepends=('python2')
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index 6e033451c..aff70e67f 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=brasero
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="A disc burning application for Gnome"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/brasero"
 license=('GPL')
 options=('!libtool' '!emptydirs')
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index b645f13e3..3a6e3f964 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=brltty
 pkgver=4.3
 pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
 license=('GPL' 'LGPL')
 depends=('libxaw' 'at-spi' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst')
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index 08871b559..ba2e71452 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
 options=('!libtool')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'glew' 'mesa' 'sdl')
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
 sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index 4f82d185b..d68c778a5 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bzr
 pkgver=2.4.2
 pkgrel=1
 pkgdesc="A decentralized revision control system (bazaar)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bazaar.canonical.com/en/"
 license=('GPL')
 depends=('python2')
diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD
index 45643af78..39792ed75 100644
--- a/extra/c-ares/PKGBUILD
+++ b/extra/c-ares/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=c-ares
 pkgver=1.7.5
 pkgrel=1
 pkgdesc='C library that performs DNS requests and name resolves asynchronously'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://c-ares.haxx.se/'
 license=('custom')
 depends=('glibc')
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 78c9c8902..dda18250d 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('ghc=7.0.2' 'haskell-http>=4000.1.1' 'haskell-zlib')
 depends=('gmp' zlib)
 options=('strip')
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
index ac8f2a431..2f81cc228 100644
--- a/extra/cagibi/PKGBUILD
+++ b/extra/cagibi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cagibi
 pkgver=0.2.0
 pkgrel=1
 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('LGPL')
 depends=('qt')
diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD
index 7fb05334a..05411ed7e 100644
--- a/extra/cairo-perl/PKGBUILD
+++ b/extra/cairo-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cairo-perl
 pkgver=1.081
 pkgrel=1
 pkgdesc="Perl wrappers for cairo"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 9c80110a0..356a9d270 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cairo
 pkgver=1.10.2
 pkgrel=2
 pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
 depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.18.4' 'glib2>=2.24.0' 'sh')
diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD
index 8bd23555e..faa47880f 100644
--- a/extra/cairomm/PKGBUILD
+++ b/extra/cairomm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cairomm
 pkgver=1.10.0
 pkgrel=1
 pkgdesc="C++ bindings to Cairo vector graphics library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cairographics.org"
 license=('LGPL' 'MPL')
 depends=('cairo' 'libsigc++')
diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index 039ea496d..f8918d70e 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=capi4hylafax
 pkgver=010300
 pkgrel=4
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="ftp://ftp.avm.de/tools"
 license=('GPL')
 depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff')
diff --git a/extra/capi4k-utils/PKGBUILD b/extra/capi4k-utils/PKGBUILD
index 07ec42be0..c76578120 100644
--- a/extra/capi4k-utils/PKGBUILD
+++ b/extra/capi4k-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=capi4k-utils
 pkgver=050718
 pkgrel=8
 pkgdesc="capi utils for isdn cards"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="ftp://ftp.in-berlin.de/pub/capi4linux/"
 makedepends=('ppp')
diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD
index 9a5f526c1..a185964b4 100644
--- a/extra/capseo/PKGBUILD
+++ b/extra/capseo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.3
 pkgrel=2
 epoch=1
 pkgdesc="Capseo video codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.gentoo.org/~trapni/capseo/"
 license=('GPL2')
 depends=('libgl' 'gcc-libs')
diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD
index cf8523bff..aa4f7da01 100644
--- a/extra/catdoc/PKGBUILD
+++ b/extra/catdoc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=catdoc
 pkgver=0.94.2
 pkgrel=3
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD
index e5a77934b..fa6a04fe1 100644
--- a/extra/ccache/PKGBUILD
+++ b/extra/ccache/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ccache
 pkgver=3.1.7
 pkgrel=1
 pkgdesc="A compiler cache"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ccache.samba.org/"
 license=('GPL')
 depends=('zlib')
diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD
index c19387e97..71ca9eabd 100644
--- a/extra/cd-discid/PKGBUILD
+++ b/extra/cd-discid/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cd-discid
 pkgver=0.9
 pkgrel=3
 pkgdesc="A backend utility to get CDDB discid information from a CD-ROM disc"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lly.org/~rcw/cd-discid/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/cdargs/PKGBUILD b/extra/cdargs/PKGBUILD
index 28e471e84..7d721064b 100644
--- a/extra/cdargs/PKGBUILD
+++ b/extra/cdargs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdargs
 pkgver=1.35
 pkgrel=3
 pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.skamphausen.de/cgi-bin/ska/CDargs"
 depends=('ncurses' 'gcc-libs')
diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD
index c51bd4ce0..223570a22 100644
--- a/extra/cdparanoia/PKGBUILD
+++ b/extra/cdparanoia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdparanoia
 pkgver=10.2
 pkgrel=3
 pkgdesc="Compact Disc Digital Audio extraction tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/paranoia/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD
index 3ef570fbe..289b3825c 100644
--- a/extra/cdrdao/PKGBUILD
+++ b/extra/cdrdao/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=('cdrdao')
 pkgname=('cdrdao' 'gcdmaster')
 pkgver=1.2.3
 pkgrel=6
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
 makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index 702e3e05f..e41ce2589 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=celestia
 pkgver=1.6.1
 pkgrel=1
 pkgdesc="Real-time space simulation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.shatters.net/celestia/"
 depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index 554c12923..5f1992744 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.280
 _pkgver=3280
 pkgrel=1
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index f2061e399..c0a9544e0 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cheese
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst'
          'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme' 'dconf')
diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD
index b3992140d..b5fbb721b 100644
--- a/extra/chemtool/PKGBUILD
+++ b/extra/chemtool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=chemtool
 pkgver=1.6.12
 pkgrel=3
 pkgdesc="A small program for drawing chemical structures"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html"
 depends=('gtk2')
diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD
index 2b950dc9c..c2a3ee416 100644
--- a/extra/chkrootkit/PKGBUILD
+++ b/extra/chkrootkit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=chkrootkit
 pkgver=0.49
 pkgrel=3
 pkgdesc="Locally checks for signs of a rootkit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chkrootkit.org"
 depends=('sh' 'net-tools')
 license=('BSD')
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index 00013a6b9..9c59de22b 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -7,17 +7,23 @@ pkgname=chmlib
 pkgver=0.40
 pkgrel=3
 pkgdesc="Library for dealing with Microsoft ITSS/CHM format files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://morte.jedrea.com/~jedwin/projects/chmlib/"
 options=('!libtool')
 license=('LGPL')
 depends=('glibc')
-source=("http://morte.jedrea.com/~jedwin/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7ea49ed8c335215c1edc6fae83e6b912')
+source=("http://morte.jedrea.com/~jedwin/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'src_chm_lib.c.diff')
+md5sums=('7ea49ed8c335215c1edc6fae83e6b912'
+         '08fe9d62302a50f23cffb6c2a7524b6d')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
+# Patch from debian
+  [ "$CARCH" = "mips64el" ] && \
+    patch -Np1 -i $srcdir/src_chm_lib.c.diff
+
   ./configure --prefix=/usr \
               --enable-examples=yes
   make
diff --git a/extra/chmlib/src_chm_lib.c.diff b/extra/chmlib/src_chm_lib.c.diff
new file mode 100644
index 000000000..742e0e521
--- /dev/null
+++ b/extra/chmlib/src_chm_lib.c.diff
@@ -0,0 +1,58 @@
+Patch to fix integer types problem by Goswin von Brederlow
+<brederlo@informatik.uni-tuebingen.de> (#258444)
+--- chmlib-0.39.orig/src/chm_lib.c
++++ chmlib-0.39/src/chm_lib.c
+@@ -56,6 +56,7 @@
+ 
+ #include "lzx.h"
+ 
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef CHM_DEBUG
+@@ -149,22 +150,9 @@
+ typedef __int64                 Int64;
+ typedef unsigned __int64        UInt64;
+ 
+-/* I386, 32-bit, non-Windows */
+-/* Sparc        */
+-/* MIPS         */
+-/* PPC          */
+-#elif __i386__ || __sun || __sgi || __ppc__
+-typedef unsigned char           UChar;
+-typedef short                   Int16;
+-typedef unsigned short          UInt16;
+-typedef long                    Int32;
+-typedef unsigned long           UInt32;
+-typedef long long               Int64;
+-typedef unsigned long long      UInt64;
+-
+ /* x86-64 */
+ /* Note that these may be appropriate for other 64-bit machines. */
+-#elif __x86_64__ || __ia64__
++#elif defined(__LP64__)
+ typedef unsigned char           UChar;
+ typedef short                   Int16;
+ typedef unsigned short          UInt16;
+@@ -173,10 +161,18 @@
+ typedef long                    Int64;
+ typedef unsigned long           UInt64;
+ 
++/* I386, 32-bit, non-Windows */
++/* Sparc        */
++/* MIPS         */
++/* PPC          */
+ #else
+-
+-/* yielding an error is preferable to yielding incorrect behavior */
+-#error "Please define the sized types for your platform in chm_lib.c"
++typedef unsigned char           UChar;
++typedef short                   Int16;
++typedef unsigned short          UInt16;
++typedef long                    Int32;
++typedef unsigned long           UInt32;
++typedef long long               Int64;
++typedef unsigned long long      UInt64;
+ #endif
+ 
+ /* GCC */
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index e04077a1b..5183fed7d 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cifs-utils
 pkgver=5.2
 pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
 depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 419c6a1cd..9217064dd 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cinepaint
 pkgver=1.0
 pkgrel=1
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL' 'MIT')
 url="http://www.cinepaint.org"
 depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index c6f92be84..022cd0e7d 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
 options=('!libtool')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'libltdl')
 backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index 37e44a542..258d3e4e6 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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'
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 18a75f5a5..464249d4b 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -5,12 +5,12 @@ pkgname=claws-mail
 pkgver=3.8.0
 pkgrel=2
 pkgdesc="A GTK+ based e-mail client."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
+makedepends=('compface' 'spamassassin' 'bogofilter')
 optdepends=('python2:           needed for some tools'
             'perl:              needed for some tools'
             'spamassassin:      adds support for spamfiltering'
diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD
index a6451270c..4738a52c6 100644
--- a/extra/clisp/PKGBUILD
+++ b/extra/clisp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=clisp
 pkgver=2.49
 pkgrel=1
 pkgdesc="ANSI Common Lisp interpreter, compiler and debugger"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://clisp.cons.org/"
 depends=('readline' 'libsigsegv')
@@ -20,8 +20,10 @@ build() {
   ./configure --prefix=/usr --with-readline --with-ffcall src
   cd src
   ./makemake --prefix=/usr --with-readline --with-ffcall --with-dynamic-ffi > Makefile
+  # Dirty hack for using arimips64 instead of arimips.c
+  [ $CARCH = "mips64el" ] && ln -s arimips64.c arimips.c
   make || return 1
   sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
   make || return 1
   make DESTDIR=$pkgdir install || return 1
-}
+}
\ No newline at end of file
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 30f69b7a9..8d42dd236 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -5,10 +5,10 @@ pkgname=cln
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="Class library for numbers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ginac.de/CLN/"
 license=('GPL')
-depends=('gmp')
+[[ "${CARCH}" == 'mips64el' ]] || depends=('gmp')
 makedepends=('texlive-core')
 options=('!libtool')
 install=cln.install
@@ -18,10 +18,22 @@ sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  sed -i 's/<sizeof(mp_limb_t) > sizeof(long)>/<(sizeof(mp_limb_t) > sizeof(long))>/' configure
+  # For unknown reasons it fails.
+  if [[ "${CARCH}" == 'mips64el' ]] ; then
+      use_gmp=--without-gmp
+  else
+      use_gmp=
+  fi
+  ./configure --prefix=/usr $use_gmp
   make all html pdf
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install install-html install-pdf
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 409fb40c1..e968a14d7 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=clutter-gst
 pkgver=1.4.6
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.clutter-project.org/"
 license=('LGPL')
 depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index 92b9a1d2c..498ebecd3 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=clutter-gtk
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD
index 5a3fb66b0..9ed47fd9e 100644
--- a/extra/clutter-gtk2/PKGBUILD
+++ b/extra/clutter-gtk2/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=clutter-gtk
 pkgver=0.10.8
 pkgrel=2
 pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index c8d527923..a1af69d63 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=clutter
 pkgver=1.8.2
 pkgrel=2
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 7b54bd725..9a59b190d 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cmake
 pkgver=2.8.7
 pkgrel=2
 pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.cmake.org"
 depends=('curl' 'libarchive' 'shared-mime-info')
diff --git a/extra/cmatrix/PKGBUILD b/extra/cmatrix/PKGBUILD
index 444a463ac..40e62d1fb 100644
--- a/extra/cmatrix/PKGBUILD
+++ b/extra/cmatrix/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cmatrix
 pkgver=1.2a
 pkgrel=6
 pkgdesc="Let you see the matrix code in your console"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.asty.org/cmatrix/"
 license=('GPL')
 depends=('ncurses' 'fontconfig')
diff --git a/extra/cmt/PKGBUILD b/extra/cmt/PKGBUILD
index df73556ce..fd45d6bad 100644
--- a/extra/cmt/PKGBUILD
+++ b/extra/cmt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cmt
 pkgver=1.16
 pkgrel=3
 pkgdesc="CMT for LADSPA"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.ladspa.org"
 depends=('ladspa' 'gcc-libs')
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index e5573747c..0013d3c44 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cmus
 pkgver=2.4.3
 pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cmus.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 16321ce85..e8d745d94 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cogl
 pkgver=1.8.2
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://www.clutter-project.org/"
 license=('GPL2')
 depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 873778ad0..880940ef7 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=colord
 pkgver=0.1.16
 pkgrel=1
 pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
 depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev')
diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD
index 98f83cb2c..46ccc1d26 100644
--- a/extra/compface/PKGBUILD
+++ b/extra/compface/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=compface
 pkgver=1.5.2
 pkgrel=3
 pkgdesc="Utils & libs to convert from/to X-Face format."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.xemacs.org/pub/xemacs/aux/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 543348b26..f96f8c71b 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!emptydirs')
 makedepends=('pkg-config' 'docbook2x')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index 5079db709..c1cf54b15 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=consolekit
 pkgver=0.4.5
 pkgrel=2
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 license=('GPL')
 depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
diff --git a/extra/convertlit/PKGBUILD b/extra/convertlit/PKGBUILD
index 4c7477666..95217f5fc 100644
--- a/extra/convertlit/PKGBUILD
+++ b/extra/convertlit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=convertlit
 pkgver=1.8
 pkgrel=6
 pkgdesc="An extractor/converter for .LIT eBooks"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.convertlit.com/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD
index 9f34c4500..c6ebc1d41 100644
--- a/extra/cpio/PKGBUILD
+++ b/extra/cpio/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cpio
 pkgver=2.11
 pkgrel=2
 pkgdesc="A tool to copy files into or out of a cpio or tar archive"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.gnu.org/software/cpio"
 depends=('glibc')
diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index a5e98d62f..b20bf3a07 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cppunit
 pkgver=1.12.1
 pkgrel=4
 pkgdesc="A C++ unit testing framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cppunit.sourceforge.net"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
diff --git a/extra/cpufrequtils/PKGBUILD b/extra/cpufrequtils/PKGBUILD
index d5b92095b..21ffbe1cd 100644
--- a/extra/cpufrequtils/PKGBUILD
+++ b/extra/cpufrequtils/PKGBUILD
@@ -7,26 +7,30 @@ pkgname=cpufrequtils
 pkgver=008
 pkgrel=1
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
 license=('GPL')
 depends=('sysfsutils')
 backup=('etc/conf.d/cpufreq')
 source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${pkgver}.tar.bz2
         cpufreq.rcd
-        cpufreq.confd)
-options=(!libtool)
+        cpufreq.confd
+        cpufrequtils-mips.patch)
+options=(!libtool !distcc)
 md5sums=('c59b71c044d463896f3247e8dd83dd7e'
          '7f2b5085df44d2df3e7c2d0b9f6dab08'
-         'baae1f2abffc6bef2bd32a8dd8263c09')
+         'baae1f2abffc6bef2bd32a8dd8263c09'
+         'edbe311e6813f3b395a08b7f174065c1')
 
 build()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make -j1 || return 1
-  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install || return 1
+  [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/cpufrequtils-mips.patch
 
-  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq" || return 1
-  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq" || return 1
+  make -j1
+  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install
+
+  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq"
+  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq"
 }
diff --git a/extra/cpufrequtils/cpufrequtils-mips.patch b/extra/cpufrequtils/cpufrequtils-mips.patch
new file mode 100644
index 000000000..cba8ab48b
--- /dev/null
+++ b/extra/cpufrequtils/cpufrequtils-mips.patch
@@ -0,0 +1,18 @@
+--- utils/aperf.c.orig	2010-07-18 01:38:02.000000000 +0800
++++ utils/aperf.c	2010-07-18 01:38:39.000000000 +0800
+@@ -68,11 +68,15 @@
+ 
+ static int cpu_has_effective_freq()
+ {
++#if defined(__i386__) || defined(__x86_64__)
+ 	/* largest base level */
+ 	if (cpuid_eax(0) < 6)
+ 		return 0;
+ 
+ 	return cpuid_ecx(6) & 0x1;
++#else
++	return 0;
++#endif
+ }
+ 
+ /*
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index c1869b9de..dac6e5f86 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=5.6.1
 _srcver=561
 pkgrel=3
 pkgdesc="A free C++ class library of cryptographic schemes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cryptopp.com/"
 license=('custom')
 depends=('gcc-libs')
diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD
index 4cbfccd32..da0efb9a2 100644
--- a/extra/cscope/PKGBUILD
+++ b/extra/cscope/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cscope
 pkgver=15.7a
 pkgrel=3
 pkgdesc="A developers tool for browsing program code"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cscope.sourceforge.net/"
 license=('BSD')
 depends=('ncurses' 'sh')
diff --git a/extra/ctags/PKGBUILD b/extra/ctags/PKGBUILD
index 4b8996c57..d2ebbc565 100644
--- a/extra/ctags/PKGBUILD
+++ b/extra/ctags/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ctags
 pkgver=5.8
 pkgrel=3
 pkgdesc="Generates an index file of language objects found in source files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 url="http://ctags.sourceforge.net/"
diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD
index 5eb0ac5c6..f49de5233 100644
--- a/extra/cups-pdf/PKGBUILD
+++ b/extra/cups-pdf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cups-pdf
 pkgver=2.6.1
 pkgrel=1
 pkgdesc="PDF printer for cups"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('cups' 'ghostscript')
 install=cups-pdf.install
 url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf"
diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD
index aaeec33b6..4f491f860 100644
--- a/extra/cups-pk-helper/PKGBUILD
+++ b/extra/cups-pk-helper/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cups-pk-helper
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="A helper that makes system-config-printer use PolicyKit"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/software/cups-pk-helper/releases/"
 license=('GPL')
 depends=(dbus-glib polkit libcups)
diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD
index 971e0d498..98903acce 100644
--- a/extra/cvs/PKGBUILD
+++ b/extra/cvs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cvs
 pkgver=1.11.23
 pkgrel=8
 pkgdesc="Concurrent Versions System - a source control system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://cvs.nongnu.org/"
 license=('GPL')
 depends=('krb5' 'zlib')
diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD
index 5caa4b2f1..0a9e8a7dd 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="Generating 'patchset' information from a CVS repository"
 url="http://www.cobite.com/cvsps/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe')
diff --git a/extra/cx_freeze/PKGBUILD b/extra/cx_freeze/PKGBUILD
index ee7476c7b..aa727dccd 100644
--- a/extra/cx_freeze/PKGBUILD
+++ b/extra/cx_freeze/PKGBUILD
@@ -9,7 +9,7 @@ _tarname=cx_Freeze
 pkgver=4.2.3
 pkgrel=1
 pkgdesc="A set of utilities for freezing Python scripts into executables"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.python.net/crew/atuining/cx_Freeze/"
 license=('custom')
 depends=('python2')
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index e39566a4c..fb52d4dfc 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -10,11 +10,11 @@ pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgver=2.1.23
 pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl' 'libtool' 'groff')
 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
@@ -97,6 +97,8 @@ build() {
   popd
 
   ./configure --prefix=/usr \
+       --host=$CHOST \
+       --build=$CHOST \
       --mandir=/usr/share/man \
       --infodir=/usr/share/info \
       --disable-static \
diff --git a/extra/dansguardian/PKGBUILD b/extra/dansguardian/PKGBUILD
index 6d943cc2a..75314e45e 100644
--- a/extra/dansguardian/PKGBUILD
+++ b/extra/dansguardian/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.10.1.1
 pkgrel=2
 pkgdesc="Squid plugin for web content filtering."
 url="http://dansguardian.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('squid' 'pcre' 'zlib')
 install=${pkgname}.install
diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD
index c40d81bc0..e6da6487b 100644
--- a/extra/dasher/PKGBUILD
+++ b/extra/dasher/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dasher
 pkgver=4.10.1
 pkgrel=3
 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index ce4340ef7..cf1503d61 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=davfs2
 pkgver=1.4.6
 pkgrel=1
 pkgdesc="File system driver that allows you to mount a WebDAV server as a local disk drive."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://savannah.nongnu.org/projects/davfs2"
 license=('GPL')
 depends=('neon')
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 5569f6dc5..339372336 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=dbus-glib
 pkgver=0.98
-pkgrel=1
+pkgrel=1.1
 pkgdesc="GLib bindings for DBUS"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 depends=('dbus-core' 'glib2')
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 8cfacff43..8120d8b36 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dbus-python
 pkgver=0.84.0
 pkgrel=1
 pkgdesc="Python bindings for DBUS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 depends=('dbus-glib' 'python2')
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 9d8ab360b..46e810395 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -4,10 +4,10 @@
 #
 pkgname=dbus
 pkgver=1.4.16
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
diff --git a/extra/dcfldd/PKGBUILD b/extra/dcfldd/PKGBUILD
index b0eb7861f..cd547aba4 100644
--- a/extra/dcfldd/PKGBUILD
+++ b/extra/dcfldd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dcfldd
 pkgver=1.3.4.1
 pkgrel=3
 pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dcfldd.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 8da8cc7fe..39c34fed7 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=dconf
 pkgver=0.10.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A low-level configuration system."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/dconf"
 license=('LGPL2.1')
 depends=('glib2')
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 67107f3bc..df7d8cc08 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dcraw
 pkgver=9.12
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
 depends=('lcms' 'jasper')
diff --git a/extra/dcron/PKGBUILD b/extra/dcron/PKGBUILD
index 5583d9267..c898df935 100644
--- a/extra/dcron/PKGBUILD
+++ b/extra/dcron/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=dcron
 pkgver=4.5
 pkgrel=2
 pkgdesc="dillon's lightweight cron daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.jimpryor.net/linux/dcron"
 backup=('var/spool/cron/root' 'etc/conf.d/crond')
diff --git a/extra/ddd/PKGBUILD b/extra/ddd/PKGBUILD
index 8fdf4cc16..a7fdf26aa 100644
--- a/extra/ddd/PKGBUILD
+++ b/extra/ddd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ddd
 pkgver=3.3.12
 pkgrel=2
 pkgdesc="A graphical front-end for command-line debuggers such as GDB, JDB, pydb, perl debugger..."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ddd/"
 license=('GPL3' 'LGPL3')
 depends=('gcc-libs' 'ncurses' 'lesstif' 'libxaw' 'elfutils' 'libxext')
diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD
index 9d57d4bb4..d74363da5 100644
--- a/extra/ddrescue/PKGBUILD
+++ b/extra/ddrescue/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ddrescue
 pkgver=1.14
 pkgrel=1
 pkgdesc="GNU data recovery tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ddrescue/ddrescue.html"
 license=('GPL3')
 depends=('gcc-libs')
diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD
index 90a3cddd4..09105e4f7 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=desktop-file-utils
 pkgver=0.19
 pkgrel=1
 pkgdesc="Command line utilities for working with desktop entries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
 license=('GPL')
 depends=('glib2')
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index aa24c7ccd..0ef5723ed 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=devhelp
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/devhelp/"
 depends=('gconf' 'libwebkit3' 'hicolor-icon-theme')
diff --git a/extra/devilspie/PKGBUILD b/extra/devilspie/PKGBUILD
index 1dba7d39b..f4792043c 100644
--- a/extra/devilspie/PKGBUILD
+++ b/extra/devilspie/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=devilspie
 pkgver=0.22
 pkgrel=4
 pkgdesc="x11 window matching utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.burtonini.com/blog/computers/devilspie"
 license=('GPL')
 depends=('libwnck')
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 4233cd589..6d72922ef 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=4.2.3.2
 _pkgver=4.2.3-P2
 
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD
index c7c556c27..7f441db76 100644
--- a/extra/di/PKGBUILD
+++ b/extra/di/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=di
 pkgver=4.31
 pkgrel=1
 pkgdesc="A disk information utility, displaying everything (and more) that your df command does"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gentoo.com/di/"
 license=('ZLIB')
 depends=('glibc')
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index 1d7ffb350..a507575d5 100644
--- a/extra/diffstat/PKGBUILD
+++ b/extra/diffstat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=diffstat
 pkgver=1.55
 pkgrel=1
 pkgdesc="Display a histogram of diff changes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/diffstat"
 depends=('glibc')
 license=('MIT')
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 2f9399b4c..d92937e2c 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libme
 pkgver=2.5.0
 pkgrel=1
 pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
diff --git a/extra/dirmngr/PKGBUILD b/extra/dirmngr/PKGBUILD
index f2f6b60e5..ff276b588 100644
--- a/extra/dirmngr/PKGBUILD
+++ b/extra/dirmngr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dirmngr
 pkgver=1.1.0
 pkgrel=3
 pkgdesc="A daemon to handle CRL and certificate requests"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
 depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index 6544542f1..17c9480cf 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=djvulibre
 pkgver=3.5.24
 pkgrel=2
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://djvu.sourceforge.net/"
 depends=('gcc-libs' 'libtiff' 'bash' 'hicolor-icon-theme')
diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD
index ada627216..c7b6e6683 100644
--- a/extra/dmapi/PKGBUILD
+++ b/extra/dmapi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dmapi
 pkgver=2.2.10
 pkgrel=3
 pkgdesc="Data migration API"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.sgi.com/projects/xfs/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD
index 6f5e9ceba..0fa067a16 100644
--- a/extra/dmidecode/PKGBUILD
+++ b/extra/dmidecode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dmidecode
 pkgver=2.11
 pkgrel=2
 pkgdesc="Desktop Management Interface table related utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/dmidecode"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 6751d8023..d310e6c2a 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -5,10 +5,10 @@
 
 pkgname=dnsmasq
 pkgver=2.59
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'dbus-core')
 makedepends=('libcap>=2.16')
diff --git a/extra/docker/PKGBUILD b/extra/docker/PKGBUILD
index 3c26eb3cc..6f1529084 100644
--- a/extra/docker/PKGBUILD
+++ b/extra/docker/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=docker
 pkgver=1.5
 pkgrel=5
 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/openbox/2/docker/"
 license=('GPL')
 depends=('glibc' 'glib2' 'libx11')
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index a2555b3be..a34a02836 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dosfstools
 pkgver=3.0.12
 pkgrel=1
 pkgdesc="DOS filesystem utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('glibc')
 source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.bz2)
 url="http://www.daniel-baumann.ch/software/dosfstools/"
diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD
index c33a2d0e5..7d58d2436 100644
--- a/extra/dotconf/PKGBUILD
+++ b/extra/dotconf/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.3
 pkgrel=2
 pkgdesc='A C library for parsing configuration files'
 url="https://github.com/williamh/dotconf"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 makedepends=('pkgconfig' 'findutils')
 license=('LGPL2.1')
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 1c4d2107e..d54633b23 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dovecot
 pkgver=2.0.17
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
 license=("LGPL")
 depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 580f01fc9..4dbdf8ecc 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('doxygen' 'doxygen-docs')
 pkgver=1.7.6.1
 pkgrel=1
 license=('GPL')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
@@ -15,13 +15,16 @@ sha1sums=('6203d4423d12315f1094b56a4d7393347104bc4a')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  QTDIR=/usr ./configure --prefix /usr --with-doxywizard
+# mips64el doesn't have qt yet
+  [ "$CARCH" != "mips64el" ] && ./configure --prefix /usr --with-doxywizard #QTDIR=/usr 
+  [ "$CARCH" = "mips64el" ] && ./configure --prefix /usr
   make
 }
 
 package_doxygen() {
   pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
   depends=('gcc-libs')
+  [ "$CARCH" = "mips64el" ] || \
   optdepends=('graphviz: for caller/callee graph generation'
               'qt: for doxywizard')
 
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index 1a24e90ca..84a6bd436 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dssi
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="An API for audio processing plugins & softsynths with UIs"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://dssi.sourceforge.net/"
 license=('LGPL' 'BSD' 'custom')
 depends=('liblo' 'jack')
diff --git a/extra/dvd+rw-tools/PKGBUILD b/extra/dvd+rw-tools/PKGBUILD
index 27c8c9122..297eaa67f 100644
--- a/extra/dvd+rw-tools/PKGBUILD
+++ b/extra/dvd+rw-tools/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dvd+rw-tools
 pkgver=7.1
 pkgrel=4
 pkgdesc="dvd burning tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fy.chalmers.se/~appro/linux/DVD+RW"
 depends=('cdrkit' 'gcc-libs')
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index edb8134bb..83cc8e71a 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dvdauthor
 pkgver=0.7.0
 pkgrel=3
 pkgdesc="DVD authoring tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dvdauthor.sourceforge.net/"
 license=('GPL')
 depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD
index e3be37d2f..01088ad73 100644
--- a/extra/dvdrip/PKGBUILD
+++ b/extra/dvdrip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dvdrip
 pkgver=0.98.11
 pkgrel=10
 pkgdesc="A Gtk frontend for transcode writen in Perl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.exit1.org/dvdrip/"
 install=${pkgname}.install
diff --git a/extra/dvdrtools/PKGBUILD b/extra/dvdrtools/PKGBUILD
index 555071bef..138c94157 100644
--- a/extra/dvdrtools/PKGBUILD
+++ b/extra/dvdrtools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dvdrtools
 pkgver=0.3.1
 pkgrel=3
 pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/dvdrtools/"
 license=('GPL')
 depends=('file' 'bash')
diff --git a/extra/dvgrab/PKGBUILD b/extra/dvgrab/PKGBUILD
index 8afb2a3ba..a8a014a7f 100644
--- a/extra/dvgrab/PKGBUILD
+++ b/extra/dvgrab/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dvgrab
 pkgver=3.5
 pkgrel=4
 pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kinodv.org/"
 license=('GPL')
 depends=('libdv' 'libavc1394' 'libjpeg-turbo' 'libiec61883' 'gcc-libs')
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index 31ea2fff8..f875707ee 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=easytag
 pkgver=2.1.6
 pkgrel=3
 pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://easytag.sourceforge.net/"
 depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'libmp4v2' 'speex' 'wavpack')
diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD
index 812beb3af..f92060fe9 100644
--- a/extra/ebook-tools/PKGBUILD
+++ b/extra/ebook-tools/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ebook-tools
 pkgver=0.2.1
 pkgrel=4
 pkgdesc="Tools for accessing and converting various ebook file formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ebook-tools/"
 license=('custom')
 depends=('libzip' 'libxml2' 'convertlit')
@@ -18,6 +18,7 @@ build() {
 
   mkdir build
   cd build
+  CXX="g++" \
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
index 185581224..05eb23efb 100644
--- a/extra/ecasound/PKGBUILD
+++ b/extra/ecasound/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ecasound
 pkgver=2.8.1
 pkgrel=1
 pkgdesc="A software package designed for multitrack audio processing"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
 depends=('gcc-libs' 'readline>=6.0.00' 'audiofile'
diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index 8ab9c23ef..273331df9 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ecl
 pkgver=11.1.1
 pkgrel=1
 pkgdesc="Embeddable Common Lisp"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ecls/"
 license=('LGPL')
 depends=('bash' 'gmp')
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 3d1f631f8..b80d72e83 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -10,7 +10,7 @@ _internal_pkgver=3.7.1
 pkgrel=2
 _date=201109091335
 pkgdesc="An IDE for Java and other languages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://eclipse.org"
 depends=('java-environment' 'gtk2' 'unzip' 'libwebkit')
 install=${pkgname}.install
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index 7bda0f640..1c25d102d 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=efibootmgr
 pkgver=0.5.4
 pkgrel=1
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linux.dell.com/efibootmgr/"
 license=('GPL2')
 depends=('zlib')
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
index 131f4584e..dfb974f82 100644
--- a/extra/eject/PKGBUILD
+++ b/extra/eject/PKGBUILD
@@ -7,8 +7,8 @@
 pkgname=eject
 pkgver=2.1.5
 pkgrel=7
-pkgdesc="A program for ejecting removable media under software control."
-arch=('i686' 'x86_64')
+pkgdesc="A program for ejecting removable media under software control"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://eject.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 12d999c2d..ceb8b10c5 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
 makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common')
 optdepends=('evolution-data-server: Evolution integration')
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index 7aef0c8f6..1f825930a 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=elfutils
 pkgver=0.152
 pkgrel=1
 pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/elfutils/"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index b47ca87b9..cd3d71d73 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -11,7 +11,7 @@ pkgver=$_majorver.$_minorver
 _realver=$_majorver$_minorver
 pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD
index b7a2cd806..e3a78dd72 100644
--- a/extra/emelfm2/PKGBUILD
+++ b/extra/emelfm2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=emelfm2
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="A file manager that implements the popular two-pane design"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://emelfm2.net/"
 depends=('gtk2')
 license=('GPL')
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 8d25db7eb..e44a59713 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=empathy
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Empathy"
 license=('GPL2')
 depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring'
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index b46dbd724..5cd24b69a 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enblend-enfuse
 pkgver=4.0
 pkgrel=4
 pkgdesc="Intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://enblend.sourceforge.net"
 depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD
index fdcea7c56..153733d53 100644
--- a/extra/enca/PKGBUILD
+++ b/extra/enca/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enca
 pkgver=1.13
 pkgrel=2
 pkgdesc="Charset analyser and converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/enca/"
 options=('!libtool')
 license=('GPL')
diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD
index a8dc20ddb..d8621ce2e 100644
--- a/extra/enchant/PKGBUILD
+++ b/extra/enchant/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enchant
 pkgver=1.6.0
 pkgrel=4
 pkgdesc="A wrapper library for generic spell checking"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.abisource.com/enchant/"
 license=('LGPL')
 depends=('aspell' 'dbus-glib' 'hunspell' 'hspell')
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index e4a3597a9..f4ec645c3 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0.10
 _themever=1.0.1
 pkgrel=1
 pkgdesc="A fast, flexible, and very extensible Window Manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD' 'custom')
 depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
diff --git a/extra/enscript/PKGBUILD b/extra/enscript/PKGBUILD
index aa9bc0aee..8b2846092 100644
--- a/extra/enscript/PKGBUILD
+++ b/extra/enscript/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enscript
 pkgver=1.6.5.2
 pkgrel=1
 pkgdesc="Convert ASCII files to PostScript suitable for printing"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 backup=('etc/enscript/enscript.cfg')
 depends=('glibc')
 license=('GPL2')
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 74e60403b..c519e11e2 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=eog-plugins
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/"
 license=('GPL2')
 depends=('eog' 'libchamplain' 'libgdata')
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index f8f55ebb0..7f73d8c1b 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=eog
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
 makedepends=('gtk-doc' 'intltool')
diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD
index 89b738142..7c22b9d5d 100644
--- a/extra/epiphany-extensions/PKGBUILD
+++ b/extra/epiphany-extensions/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.2.0
 pkgrel=2
 url="http://www.gnome.org/projects/epiphany/"
 pkgdesc="Various extentions for the Epiphany web browser"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('epiphany' 'opensp' 'hicolor-icon-theme')
 makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 21aa3faac..a47982e99 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.2.1
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
          'hicolor-icon-theme' 'seed')
diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD
index 4daecec04..33af3327e 100644
--- a/extra/epplet-base/PKGBUILD
+++ b/extra/epplet-base/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=epplet-base
 pkgver=0.13
 pkgrel=2
 pkgdesc="Addon plugins for the enlightenment windowmanager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('GPL')
 depends=('imlib2' 'libcdaudio' 'libgl')
diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD
index 62458f595..27ec63f41 100644
--- a/extra/erlang/PKGBUILD
+++ b/extra/erlang/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=erlang
 pkgver=R14B04
 pkgrel=2
 pkgdesc="A small concurrent functional programming language developed by Ericsson."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.erlang.org/index.html"
 license=('custom')
 depends=('ncurses' 'glibc')
diff --git a/extra/ethstatus/PKGBUILD b/extra/ethstatus/PKGBUILD
index 9333a6adf..b9352a85a 100644
--- a/extra/ethstatus/PKGBUILD
+++ b/extra/ethstatus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ethstatus
 pkgver=0.4.3
 pkgrel=2
 pkgdesc="A simple program for displaying commonly needed/wanted statistics in real time of incoming and outgoing traffic"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.qa.debian.org/e/ethstatus.html"
 license=('GPL')
 depends=('ncurses')
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 8e759763b..a67573cce 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.2
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 903b506ab..fb5f7afb0 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('ettercap' 'ettercap-gtk')
 pkgver=NG_0.7.4.2
 _origver=${pkgver/_/-}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
 makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
diff --git a/extra/evilwm/PKGBUILD b/extra/evilwm/PKGBUILD
index 4cee0b427..d86cabd4b 100644
--- a/extra/evilwm/PKGBUILD
+++ b/extra/evilwm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=evilwm
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://evilwm.sourceforge.net"
 license=('custom')
 depends=('libxrandr')
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 242d7472b..8f5fe461c 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.2.1
 pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
@@ -19,6 +19,10 @@ sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+# Build with -march=mips3 
+  [ "$CARCH" = "mips64el" ] && CFLAGS="${CFLAGS/loongson2f/mips3}"
+
   ./configure --prefix=/usr   --sysconfdir=/etc \
       --localstatedir=/var    --libexecdir=/usr/lib/evince \
       --disable-static        --enable-nautilus \
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 80b1ed2aa..88b95f5b2 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=evolution-data-server
 pkgver=3.2.3
 pkgrel=2
 pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
 makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
 options=('!libtool')
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index b0a9f8837..806163d7f 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=evolution-exchange
 pkgver=3.2.3
 pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.ximian.com"
 depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 168d89d71..67b3bf47b 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=evolution
 pkgver=3.2.3
 pkgrel=2
 pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD
index 0f385c8be..a8f53f5e5 100644
--- a/extra/exempi/PKGBUILD
+++ b/extra/exempi/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=exempi
 pkgver=2.1.1
 pkgrel=1
 pkgdesc="A library to parse XMP metadata"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://libopenraw.freedesktop.org/wiki/Exempi"
 license=('custom:BSD')
 depends=('gcc-libs>=4.4.2' 'expat>=2.0.1' 'zlib')
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index 278a7dd8d..169dfd138 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=exiv2
 pkgver=0.22
 pkgrel=1
 pkgdesc="Exif and Iptc metadata manipulation library and tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://exiv2.org"
 license=('GPL')
 depends=('gcc-libs' 'zlib' 'expat')
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index ebfbeed84..f60729239 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=exo
 pkgver=0.6.2
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Extensions to Xfce by os-cillation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL')
 url="http://www.xfce.org/projects/exo"
 groups=('xfce4')
diff --git a/extra/expect/PKGBUILD b/extra/expect/PKGBUILD
index 3b630ba43..29099e923 100644
--- a/extra/expect/PKGBUILD
+++ b/extra/expect/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=expect
 pkgver=5.45
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A tool for automating interactive applications"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.nist.gov/el/msid/expect.cfm"
 license=('custom')
 depends=('tcl>=8.5.3')
diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD
index 6b846e191..8d0cc7bcc 100644
--- a/extra/f-spot/PKGBUILD
+++ b/extra/f-spot/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.8.2
 pkgrel=3
 pkgdesc="A personal photo management program for GNOME"
 url="http://www.gnome.org/projects/f-spot/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD
index 04aae2b74..90b7405dc 100644
--- a/extra/faad2/PKGBUILD
+++ b/extra/faad2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=faad2
 pkgver=2.7
 pkgrel=2
 pkgdesc="ISO AAC audio decoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.audiocoding.com/"
 license=('custom:GPL')
 depends=('glibc')
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index dc128d465..6d48f77bd 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=facile
 pkgver=1.1
 pkgrel=13
 pkgdesc="A Functional Constraint Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.recherche.enac.fr/opti/facile/"
 license="LGPL"
 makedepends=('ocaml')
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index 12587fced..fd6ca6960 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fakechroot
 pkgver=2.16
 pkgrel=1
 pkgdesc="Gives a fake chroot environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fakechroot/fakechroot/wiki"
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD
index 0a74c8618..02144244e 100644
--- a/extra/farsight2/PKGBUILD
+++ b/extra/farsight2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=farsight2
 pkgver=0.0.31
 pkgrel=1
 pkgdesc="Audio/Video conference software for Instant Messengers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://farsight.freedesktop.org"
 license=('LGPL')
 depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0.10-bad' 'gstreamer0.10-python' 'pygobject')
diff --git a/extra/fastjar/PKGBUILD b/extra/fastjar/PKGBUILD
index 345493735..f0bb8176c 100644
--- a/extra/fastjar/PKGBUILD
+++ b/extra/fastjar/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fastjar
 pkgver=0.98
 pkgrel=1
 pkgdesc="Sun java jar compatible archiver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/fastjar"
 license=('GPL')
 depends=('zlib' 'texinfo')
diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index b6081ed88..5b52a4e5f 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fbida
 pkgver=2.08
 pkgrel=1
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kraxel.org/blog/linux/fbida/"
 license=('GPL2')
 depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig')
diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD
index 89cd0b7ae..787008d0f 100644
--- a/extra/fbset/PKGBUILD
+++ b/extra/fbset/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbset
 pkgver=2.1
 pkgrel=4
 pkgdesc="Framebuffer setup utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://users.telenet.be/geertu/Linux/fbdev/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD
index 39584d9b9..a093e0fb1 100644
--- a/extra/fcgi/PKGBUILD
+++ b/extra/fcgi/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.4.0
 pkgrel=7
 depends=('gcc-libs')
 pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 options=('!libtool' '!makeflags')
 url="http://www.fastcgi.com"
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index fea27eed6..00ddeae8a 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
 pkgver=4.1.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
 makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index bb7f1e9ca..e171b92c8 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
 license=('MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index 1124eb914..4ec82f8d7 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.1
 _suffix=release
 pkgrel=3
 pkgdesc="A general multi-lingual speech synthesis system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cstr.ed.ac.uk/projects/festival/"
 license=('BSD' 'GPL' 'custom')
 depends=('perl')
diff --git a/extra/festival/config.guess b/extra/festival/config.guess
new file mode 100755
index 000000000..f7dd69ecc
--- /dev/null
+++ b/extra/festival/config.guess
@@ -0,0 +1,1516 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-08-20'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/extra/festival/config.sub b/extra/festival/config.sub
new file mode 100755
index 000000000..0d2cddec7
--- /dev/null
+++ b/extra/festival/config.sub
@@ -0,0 +1,1766 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-09-09'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index ad0edc057..dd59ca350 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fetchmail
 pkgver=6.3.21
 pkgrel=2
 pkgdesc="A remote-mail retrieval utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fetchmail.berlios.de/"
 license=('GPL')
 depends=('openssl')
diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD
index 5d21a3d7b..e727b0dcd 100644
--- a/extra/ffcall/PKGBUILD
+++ b/extra/ffcall/PKGBUILD
@@ -6,17 +6,25 @@ pkgname=ffcall
 pkgver=1.10
 pkgrel=4
 pkgdesc="C library for implementing foreign function calls in embedded interpreters"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libffcall/"
 license=('GPL2')
 options=('!libtool' '!makeflags')
-source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4')
+source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz
+        mipsn32.patch)
+md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4'
+         '64045515f2664b5544943c6754bf2737')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  [ "$CARCH" = "mips64el" ] && {
+    CONFIGFLAG="--with-pic"
+    patch -Np0 -i "$srcdir/mipsn32.patch"
+  }
+
   ./configure --prefix=/usr --mandir=/usr/share/man $CONFIGFLAG
+
   make
 }
 
diff --git a/extra/ffcall/mipsn32.patch b/extra/ffcall/mipsn32.patch
new file mode 100644
index 000000000..2a667c37c
--- /dev/null
+++ b/extra/ffcall/mipsn32.patch
@@ -0,0 +1,11 @@
+--- autoconf/config.guess.orig	2011-05-08 14:09:55.621461438 -0300
++++ autoconf/config.guess	2011-05-08 14:10:12.225759443 -0300
+@@ -882,7 +882,7 @@
+ 	#undef mips64
+ 	#undef mips64el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=mipsn32
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips64
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index c8c5e77c8..a9ffd7fae 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -7,20 +7,32 @@ pkgname=ffmpeg
 pkgver=20120111
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ffmpeg.org/"
 license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
+if [ "${CARCH}" = "mips64el" ] ; then
+    depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+    makedepends=('git')
+else
+    depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+    makedepends=('yasm' 'git' 'libvdpau')
+fi
 #git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz
-        revert-enabling-threads.patch)
-md5sums=('7a54b2b1af86a746696d1c0b2a79979c'
-         '79cc22bc2ac3e67d96c340cb7061e64d')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz
+        revert-enabling-threads.patch
+        ffmpeg-loongson.patch)
 
 build() {
   cd "$srcdir/$pkgname"
 
+  if [ "$CARCH" = "mips64el" ] ; then
+# Make video decoding faster and turn all pixels green.
+#      patch -Np1 -i $srcdir/ffmpeg-loongson.patch
+      extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi"
+  else
+      extraconf=""
+  fi
+
   patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch"
 
   ./configure \
@@ -45,8 +57,9 @@ build() {
     --enable-gpl \
     --enable-version3 \
     --enable-runtime-cpudetect \
+    --disable-static \
     --disable-debug \
-    --disable-static
+    $extraconf
 
   make
   make tools/qt-faststart
diff --git a/extra/ffmpeg/ffmpeg-loongson.patch b/extra/ffmpeg/ffmpeg-loongson.patch
new file mode 100644
index 000000000..d576812da
--- /dev/null
+++ b/extra/ffmpeg/ffmpeg-loongson.patch
@@ -0,0 +1,1767 @@
+diff -Nru ffmpeg.orig/configure ffmpeg/configure
+--- ffmpeg.orig/configure	2011-12-09 21:40:32.268783206 +0100
++++ ffmpeg/configure	2011-12-09 21:40:50.408820175 +0100
+@@ -249,6 +249,7 @@
+   --disable-armvfp         disable ARM VFP optimizations
+   --disable-iwmmxt         disable iwmmxt optimizations
+   --disable-mmi            disable MMI optimizations
++  --disable-loongson2mmi   disable LOONGSON2 Multi-Media Instructions usage"
+   --disable-neon           disable neon optimizations
+   --disable-vis            disable VIS optimizations
+   --disable-yasm           disable use of yasm assembler
+@@ -1110,6 +1111,7 @@
+     avx
+     iwmmxt
+     mmi
++    loongson2mmi
+     mmx
+     mmx2
+     neon
+@@ -3367,6 +3369,7 @@
+ fi
+ if enabled mips; then
+     echo "MMI enabled               ${mmi-no}"
++    echo "LOONGSON2MMI enabled               ${loongson2mmi-no}"
+ fi
+ if enabled ppc; then
+     echo "AltiVec enabled           ${altivec-no}"
+diff -Nru ffmpeg.orig/libavcodec/avcodec.h ffmpeg/libavcodec/avcodec.h
+--- ffmpeg.orig/libavcodec/avcodec.h	2011-12-09 21:40:31.980782616 +0100
++++ ffmpeg/libavcodec/avcodec.h	2011-12-09 21:40:50.504820368 +0100
+@@ -1824,6 +1824,8 @@
+ #define FF_IDCT_SIMPLENEON    22
+ #define FF_IDCT_SIMPLEALPHA   23
+ #define FF_IDCT_BINK          24
++#define FF_IDCT_LIBMPEG2LOONGSON2	25
++#define FF_IDCT_XVIDLOONGSON2 26
+ 
+     /**
+      * slice count
+diff -Nru ffmpeg.orig/libavcodec/dsputil.c ffmpeg/libavcodec/dsputil.c
+--- ffmpeg.orig/libavcodec/dsputil.c	2011-12-09 21:40:31.912782478 +0100
++++ ffmpeg/libavcodec/dsputil.c	2011-12-09 21:40:50.568820499 +0100
+@@ -3193,6 +3193,7 @@
+     if (HAVE_MMI)        dsputil_init_mmi   (c, avctx);
+     if (ARCH_SH4)        dsputil_init_sh4   (c, avctx);
+     if (ARCH_BFIN)       dsputil_init_bfin  (c, avctx);
++    if (HAVE_LOONGSON2MMI)	dsputil_init_loongson2(c, avctx);
+ 
+     for(i=0; i<64; i++){
+         if(!c->put_2tap_qpel_pixels_tab[0][i])
+diff -Nru ffmpeg.orig/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h
+--- ffmpeg.orig/libavcodec/dsputil.h	2011-12-09 21:40:31.720782087 +0100
++++ ffmpeg/libavcodec/dsputil.h	2011-12-09 21:40:50.628820621 +0100
+@@ -650,6 +650,7 @@
+ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
+ void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
+ void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
++void dsputil_init_loongson2(DSPContext* c, AVCodecContext *avctx);
+ 
+ void ff_dsputil_init_dwt(DSPContext *c);
+ void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);
+diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.c ffmpeg/libavcodec/loongson2/dsputil_loongson2.c
+--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.c	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.c	2011-12-09 21:40:50.668820701 +0100
+@@ -0,0 +1,221 @@
++/*
++ *  Copyright(C) 2006-2010 comcat <jiankemeng@gmail.com>
++ *
++ *  Optimized for Loongson2 CPUs by comcat <jiankemeng@gmail.com>
++ * 
++ */
++
++#include "dsputil_loongson2.h"
++#include "../simple_idct.h"
++#include "../mpegvideo.h"
++
++//extern void ff_idct_xvid_loongson2(short *block);
++
++extern void ff_loongson2_idct(DCTELEM *block);
++extern void ff_idct_xvid_loongson2(short *block);
++
++static void add_pixels_clamped_loongson2(const DCTELEM *block, uint8_t *restrict pixels, int line_size)
++{
++    const DCTELEM *p;
++    uint8_t *pix;
++    int i,j;
++    p = block;
++    pix = pixels;
++    i = 4;
++    j = line_size << 1;
++	__asm __volatile("xor  $f14, $f14, $f14\n\t");
++	do {
++		__asm __volatile(
++//				".set mips3					\n\t"
++				"ldc1   $f0, 0(%2)			\n\t"
++				"ldc1   $f2, 8(%2)			\n\t"
++				"ldc1   $f4, 16(%2)			\n\t"
++				"ldc1   $f6, 24(%2)			\n\t"
++				"ldc1   $f8, %0				\n\t"
++				"ldc1   $f12, %1			\n\t"
++				"mov.d  $f10, $f8			\n\t"
++
++				"punpcklbh  $f8, $f8, $f14 	\n\t"
++				"punpckhbh  $f10, $f10, $f14\n\t"
++
++				"paddsh $f0, $f0, $f8		\n\t"
++				"paddsh $f2, $f2, $f10		\n\t"
++
++				"mov.d  $f10, $f12			\n\t"
++
++				"punpcklbh  $f12, $f12, $f14\n\t"
++				"punpckhbh  $f10, $f10, $f14\n\t"
++
++				"paddsh $f4, $f4, $f12		\n\t"
++				"paddsh $f6, $f6, $f10		\n\t"
++
++				"packushb   $f0, $f0, $f2	\n\t"
++				"packushb   $f4, $f4, $f6	\n\t"
++
++				"sdc1   $f0, %0				\n\t"
++				"sdc1   $f4, %1				\n\t"
++//				".set mips2					\n\t"
++				:"+m"(*pix), "+m"(*(pix+line_size))
++				:"r"(p)
++				:"$f0","$f2","$f4","$f6","$f8","$f10","$f12","$f14","memory");
++		pix += j;
++		p += 16;
++	} while (--i);
++
++}
++
++static void put_pixels_clamped_loongson2(const DCTELEM *block, uint8_t *restrict pixels, int line_size)
++{
++    const DCTELEM *p;
++    uint8_t *pix;
++    int tmp = line_size * 3;
++    p = block;
++    pix = pixels;
++	__asm __volatile
++	   (
++//		   ".set mips3 \n\t"
++		   //"dadd	$12, $0, $0\n\t"
++		   //"dadd	$13, $0, $0\n\t"
++		   //"dadd	$14, $0, $0\n\t"
++
++		   "ldc1    $f0, 0(%3)\n\t"
++		   "ldc1    $f2, 8(%3)\n\t"
++		   "ldc1    $f4, 16(%3)\n\t"
++		   "ldc1    $f6, 24(%3)\n\t"
++		   "ldc1    $f8, 32(%3)\n\t"
++		   "ldc1    $f10, 40(%3)\n\t"
++		   "ldc1    $f16, 48(%3)\n\t"
++		   "ldc1    $f18, 56(%3)\n\t"
++
++		   "packushb    $f0, $f0, $f2\n\t"
++		   "packushb    $f4, $f4, $f6\n\t"
++		   "packushb    $f8, $f8, $f10\n\t"
++		   "packushb    $f16, $f16, $f18\n\t"
++
++		   "add    $12, %0, %1\n\t"
++		   "add    $13, $12, %1\n\t"
++		   "add    $14, %0, %2\n\t"
++
++		   "sdc1    $f0, 0(%0)\n\t"
++		   "sdc1    $f4, 0($12)\n\t"
++		   "sdc1    $f8, 0($13)\n\t"
++		   "sdc1    $f16, 0($14)\n\t"
++//		   ".set mips2\n\t"
++		   :
++		   :"r" (pix), "r" (line_size), "r" (tmp), "r"(p)
++		   :"$12","$13","$14","$f0","$f2","$f4","$f6","$f8","$f10","$16","$18"
++		);
++
++		pix += line_size*4;
++		p += 32;
++
++	__asm __volatile
++		(
++//			".set mips3 \n\t"
++
++		    "dadd	$12, $0, $0\n\t"
++		    "dadd	$13, $0, $0\n\t"
++		    "dadd	$14, $0, $0\n\t"
++			"lw      $12, %3\n\t"
++
++			"ldc1    $f0, 0($12)\n\t"
++			"ldc1    $f2, 8($12)\n\t"
++			"ldc1    $f4, 16($12)\n\t"
++			"ldc1    $f6, 24($12)\n\t"
++			"ldc1    $f8, 32($12)\n\t"
++			"ldc1    $f10, 40($12)\n\t"
++			"ldc1    $f16, 48($12)\n\t"
++			"ldc1    $f18, 56($12)\n\t"
++
++			"packushb        $f0, $f0, $f2\n\t"
++			"packushb        $f4, $f4, $f6\n\t"
++			"packushb        $f8, $f8, $f10\n\t"
++			"packushb        $f16, $f16, $f18\n\t"
++
++			"add    $12, %1, %0\n\t"
++			"add    $13, $12, %1\n\t"
++			"add    $15, %2, %0\n\t"
++
++			"sdc1    $f0, 0(%0)\n\t"
++			"sdc1    $f4, 0($12)\n\t"
++
++			"sdc1    $f8, 0($13)\n\t"
++			"sdc1    $f16, 0($15)\n\t"
++//			".set mips2\n\t"
++			:
++			:"r" (pix), "r" (line_size), "r" (tmp), "m"(p)
++			:"$12","$13","$15","$f0","$f2","$f4","$f6","$f8","$f10","$16","$18","memory"
++		);
++
++}
++
++/*
++void put_signed_pixels_clamped_loongson2(const DCTELEM *block, uint8_t *pixels, int line_size)
++{
++
++}
++
++
++void ff_loongson2_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
++{
++	ff_loongson2_idct(block);
++	put_pixels_clamped_loongson2(block, dest, line_size);
++}
++
++void ff_loongson2_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
++{
++	ff_loongson2_idct(block);
++	add_pixels_clamped_loongson2(block, dest, line_size);	
++}*/
++
++static void ff_idct_xvid_loongson2_put(uint8_t *dest, int line_size, DCTELEM *block)
++{
++	ff_idct_xvid_loongson2(block);	
++	put_pixels_clamped_loongson2(block, dest, line_size);
++}
++
++static void ff_idct_xvid_loongson2_add(uint8_t *dest, int line_size, DCTELEM *block)
++{
++	ff_idct_xvid_loongson2(block);	
++	add_pixels_clamped_loongson2(block, dest, line_size);	
++}
++
++void dsputil_init_loongson2(DSPContext *c, AVCodecContext *avctx)
++{
++
++	const int idct_algo = avctx->idct_algo;
++
++/*
++#ifdef CONFIG_ENCODERS
++	const int dct_algo = avctx->dct_algo;
++	if(dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_LOONGSON2)
++		c->fdct = ff_fdct_loongson2;
++#endif
++*/
++
++#if 0
++	if(avctx->lowres==0)
++	{
++		if(idct_algo == FF_IDCT_LIBMPEG2LOONGSON2)
++		{
++			c->idct_add = ff_loongson2_idct_add;
++			c->idct_put = ff_loongson2_idct_put;
++			c->idct = ff_loongson2_idct;
++		}
++		else if(idct_algo == FF_IDCT_XVIDLOONGSON2)
++		{
++#endif
++			c->idct_add = ff_idct_xvid_loongson2_add;
++			c->idct_put = ff_idct_xvid_loongson2_put;
++			c->idct = ff_idct_xvid_loongson2;
++		//}
++	//}
++
++	c->put_pixels_clamped = put_pixels_clamped_loongson2;
++	c->add_pixels_clamped = add_pixels_clamped_loongson2;
++
++#ifdef	CONFIG_ENCODERS
++	dsputil_init_pix_loongson2(c, avctx);
++#endif
++
++}
+diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.d ffmpeg/libavcodec/loongson2/dsputil_loongson2.d
+--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.d	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.d	2011-12-09 21:40:50.680820726 +0100
+@@ -0,0 +1,18 @@
++libavcodec/loongson2/dsputil_loongson2.o: \
++ libavcodec/loongson2/dsputil_loongson2.c \
++ libavcodec/loongson2/dsputil_loongson2.h libavcodec/dsputil.h \
++ libavutil/intreadwrite.h config.h libavutil/bswap.h \
++ libavutil/attributes.h libavutil/common.h libavutil/intmath.h \
++ libavutil/mem.h libavutil/internal.h libavutil/timer.h libavutil/libm.h \
++ libavutil/mips/intreadwrite.h libavcodec/avcodec.h libavutil/avutil.h \
++ libavutil/error.h libavutil/avutil.h libavutil/mathematics.h \
++ libavutil/rational.h libavutil/intfloat_readwrite.h libavutil/log.h \
++ libavutil/pixfmt.h libavutil/avconfig.h \
++ libavcodec/loongson2/../simple_idct.h libavcodec/loongson2/../dsputil.h \
++ libavcodec/loongson2/../mpegvideo.h libavcodec/loongson2/../get_bits.h \
++ libavutil/bswap.h libavutil/common.h libavutil/log.h \
++ libavcodec/loongson2/../mathops.h libavcodec/loongson2/../mips/mathops.h \
++ libavcodec/loongson2/../put_bits.h libavcodec/loongson2/../ratecontrol.h \
++ libavcodec/loongson2/../eval.h libavcodec/loongson2/../parser.h \
++ libavcodec/loongson2/../avcodec.h libavcodec/loongson2/../mpeg12data.h \
++ libavutil/rational.h libavcodec/loongson2/../rl.h
+diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.h ffmpeg/libavcodec/loongson2/dsputil_loongson2.h
+--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.h	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.h	2011-12-09 21:40:50.692820753 +0100
+@@ -0,0 +1,3 @@
++#include "libavcodec/dsputil.h"
++
++void dsputil_init_pix_loongson2(DSPContext* c, AVCodecContext *avctx);
+diff -Nru ffmpeg.orig/libavcodec/loongson2/idct_loongson2.c ffmpeg/libavcodec/loongson2/idct_loongson2.c
+--- ffmpeg.orig/libavcodec/loongson2/idct_loongson2.c	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/idct_loongson2.c	2011-12-09 21:40:50.744820857 +0100
+@@ -0,0 +1,336 @@
++/*
++ * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
++ * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
++ *
++ * Copyright (c) 2007-2010 comcat <jiankemeng@gmail.com>.
++ *
++ * Optimized for Loongson2 CPUs by comcat <jiankemeng@gmail.com>
++ * 
++ * Based on i386
++ */
++
++#include "libavutil/common.h"
++#include "dsputil_loongson2.h"
++
++
++#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
++
++
++#define ROW_SHIFT 11
++#define COL_SHIFT 6
++
++#define round(bias) ((int)(((bias)+0.5) * (1<<ROW_SHIFT)))
++#define rounder(bias) {round (bias), round (bias)}
++
++
++
++#define loongson2_table(c1,c2,c3,c4,c5,c6,c7) { c4,c2,-c4,-c2, \
++					       c4,c6,c4,c6, \
++					       c1,c3,-c1,-c5,\
++					       c5,c7,c3,-c7, \
++					       c4,-c6,c4,-c6, \
++					       -c4,c2,c4,-c2, \
++					       c5,-c1,c3,-c1, \
++					       c7,c3,c7,-c5 }
++
++
++static inline void loongson2_row_head(int16_t * const row, const int offset,
++					const int16_t * const table)
++{
++	__asm__ volatile(
++//		".set\tmips3\n"
++		".set noreorder\n"
++		"ldc1	$f6,%0\n"
++		"ldc1	$f14,%1\n"
++		"ldc1	$f2,%2\n"
++		"ldc1	$f8,%3\n"
++		"dli $12,%4\n"
++		"dmtc1	$12,$f16\n"
++		"mov.d	$f4,$f6\n"
++		"mov.d	$f10,$f14\n"
++		"pmaddhw	$f2,$f2,$f4\n"
++		"pshufh	$f6,$f6,$f16\n"
++		".set reorder\n"
++//		".set\tmips0\n"
++		:	
++		:"m"(*(row+offset)),"m"(*(row+offset+4)),"m"(*table),"m"(*(table+4)),"i"(0x4e)
++		:"$f2","$f4","$f6","$f8","$f10","$f14","$f16","$12"
++	);
++}
++
++
++static inline void loongson2_row(const int16_t * const table,
++				const int32_t * const rounder)
++{
++	__asm__ volatile (
++//	".set\tmips3\n"
++	".set\tnoreorder\n"
++	"ldc1	$f0,%0\n"
++	"pmaddhw $f8,$f8,$f6\n"
++	"ldc1	$f16,%1\n"
++	"dli	$13,%8\n"
++	"ldc1	$f20,%2\n"
++	"pmaddhw $f0,$f0,$f14\n"
++	"ldc1	$f22,%3\n"
++	"pmaddhw $f4,$f4,$f16\n"
++	"paddw	$f2,$f2,$f22\n"
++	"ldc1	$f22,%4\n"
++	"dmtc1	$13,$f16\n"
++	"paddw	$f2,$f2,$f8\n"
++	"pmaddhw	$f14,$f14,$f22\n"
++	"mov.d	$f8,$f2\n"
++	"pshufh	$f10,$f10,$f16\n"
++	"ldc1	$f22,%3\n"
++	"pmaddhw	$f20,$f20,$f10\n"
++	"ldc1	$f16,%5\n"
++	"paddw	$f4,$f4,$f22\n"
++	"paddw	$f0,$f0,$f20\n"
++	"dli	$12,%6\n"
++	"pmaddhw	$f6,$f6,$f16\n"
++	"psubw	$f2,$f2,$f0\n"
++	"ldc1	$f16,%7\n"
++	"paddw	$f0,$f0,$f8\n"
++	"paddw	$f4,$f4,$f6\n"
++	"pmaddhw	$f10,$f10,$f16\n"
++	"mov.d	$f8,$f4\n"
++	"dmtc1	$12,$f16\n"
++	"paddw	$f14,$f14,$f10\n"
++	"psraw	$f2,$f2,$f16\n"
++	"psraw	$f0,$f0,$f16\n"
++	"paddw	$f4,$f4,$f14\n"
++	"psubw	$f8,$f8,$f14\n"
++	".set\treorder\n"
++//	".set\tmips0\n"
++	:
++	:"m"(*(table+8)),"m"(*(table+16)),"m"(*(table+12)),"m"(*rounder),"m"(*(table+24)),"m"(*(table+20)),"i"(ROW_SHIFT),"m"(*(table+16)),"i"(0x4e)
++	:"$f0","$f2","$f4","$f6","$f8","$f10","$f14","$f16","$f20","$f22","$12","$13","memory"
++	);
++}
++
++static inline void loongson2_row_tail(int16_t * const row, const int store)
++{
++	__asm__ volatile (
++//	".set\tmips3\n"
++	".set\tnoreorder\n"
++	"dli	$12,%2\n"
++	"dmtc1	$12,$f16\n"
++	"psraw	$f4,$f4,$f16\n"
++	"psraw	$f8,$f8,$f16\n"
++	"packsswh	$f0,$f0,$f4\n"
++	"packsswh	$f8,$f8,$f2\n"
++	"sdc1	$f0,%0\n"
++	"dli $13,%3\n"
++	"dmtc1	$13,$f22\n"
++	"pshufh	$f8,$f8,$f22\n"
++	"sdc1	$f8,%1\n"
++	".set\treorder\n"
++//	".set\tmips0\n"
++	:"=m"(*(row+store)),"=m"(*(row+store+4))
++	:"i"(ROW_SHIFT),"i"(0xb1)
++	:"$f0","$f2","$f4","$f6","$f8","$f16","$f22","$12","$13","memory"
++	);
++}
++
++static inline void loongson2_row_mid(int16_t * const row, const int store,
++					const int offset,
++					const int16_t * const table)
++{
++	__asm__ volatile (
++//	".set\tmips3\n"
++	".set\tnoreorder\n"
++	"ldc1	$f6,%2\n"
++	"dli $12,%3\n"
++	"dmtc1	$12,$f16\n"
++	"psraw	$f4,$f4,$f16\n"
++	"ldc1	$f14,%4\n"
++	"psraw	$f8,$f8,$f16\n"
++	"packsswh	$f0,$f0,$f4\n"
++	"mov.d	$f10,$f14\n"
++	"packsswh	$f8,$f8,$f2\n"
++	"mov.d	$f4,$f6\n"
++	"sdc1	$f0,%0\n"
++	"dli $13,%5\n"
++	"dmtc1	$13,$f22\n"
++	"pshufh	$f8,$f8,$f22\n"
++	"ldc1	$f2,%6\n"
++	"sdc1	$f8,%1\n"
++	"pmaddhw	$f2,$f2,$f4\n"
++	"ldc1	$f8,%7\n"
++	"dli $12,%8\n"
++	"dmtc1	$12,$f16\n"
++	"pshufh	$f6,$f6,$f16\n"
++	".set\treorder\n"
++//	".set\tmips0\n"
++	:"=m"(*(row+store)),"=m"(*(row+store+4))
++	: "m"(*(row+offset)),"i"(ROW_SHIFT),"m"(*(row+offset+4)),"i"(0xb1),"m"(*table),"m"(*(table+4)),"i"(0x4e)
++	:"$f0","$f2","$f4","$f6","$f8","$f10","$14","$f16","$f22","$12","$13","memory"
++	);
++}
++
++static inline void idct_col(int16_t * const col, const int offset)
++{
++#define T1 13036
++#define T2 27146
++#define T3 43790
++#define C4 23170
++	static const short _T1[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
++	static const short _T2[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
++	static const short _T3[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
++	static const short _C4[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
++
++	__asm__ volatile (
++//	".set\tmips3\n"
++	".set\tnoreorder\n"
++	"ldc1	$f4,%8\n"
++	"ldc1	$f0,%9\n"
++	"mov.d	$f6,$f4\n"
++	"ldc1	$f8,%10\n"
++	"pmulhh	$f4,$f4,$f0\n"
++	"ldc1	$f14,%11\n"
++	"pmulhh	$f6,$f6,$f8\n"
++	"ldc1	$f10,%12\n"
++	"mov.d	$f20,$f14\n"
++	"ldc1	$f2,%13\n"
++	"psubsh	$f4,$f4,$f8\n"
++	"ldc1	$f8,%14\n"
++	"pmulhh	$f14,$f14,$f2\n"
++	"paddsh	$f0,$f0,$f6\n"
++	"pmulhh	$f20,$f20,$f10\n"
++	"mov.d	$f6,$f8\n"
++	"paddsh	$f14,$f14,$f2\n"
++	"ldc1	$f16,%15\n"
++	"pmulhh	$f8,$f8,$f16\n"
++	"paddsh	$f20,$f20,$f10\n"
++	"psubsh	$f14,$f14,$f10\n"
++	"paddsh	$f20,$f20,$f2\n"
++	"ldc1	$f2,%16\n"
++	"mov.d	$f10,$f4\n"
++	"pmulhh	$f6,$f6,$f2\n"
++	"psubsh	$f4,$f4,$f14\n"
++	"psubsh	$f8,$f8,$f2\n"
++	"paddsh	$f14,$f14,$f10\n"
++	"sdc1	$f4,%0\n"
++	"mov.d	$f10,$f0\n"
++	"ldc1	$f22,%15\n"
++	"paddsh	$f6,$f6,$f22\n"
++	"paddsh	$f10,$f10,$f20\n"
++	"psubsh	$f0,$f0,$f20\n"
++	"mov.d	$f20,$f0\n"
++	"ldc1	$f2,%17\n"
++	"paddsh	$f0,$f0,$f14\n"
++	"ldc1	$f4,%18\n"
++	"psubsh	$f20,$f20,$f14\n"
++	"sdc1	$f10,%1\n"
++	"pmulhh	$f0,$f0,$f4\n"
++	"mov.d	$f10,$f8\n"
++	"pmulhh	$f20,$f20,$f4\n"
++	"ldc1	$f14,%19\n"
++	"mov.d	$f4,$f2\n"
++	"psubsh	$f2,$f2,$f14\n"
++	"paddsh	$f4,$f4,$f14\n"
++	"paddsh	$f8,$f8,$f2\n"
++	"mov.d	$f14,$f4\n"
++	"psubsh	$f2,$f2,$f10\n"
++	"paddsh	$f14,$f14,$f6\n"
++	"paddsh	$f0,$f0,$f0\n"
++	"psubsh	$f4,$f4,$f6\n"
++	"paddsh	$f20,$f20,$f20\n"
++	"mov.d	$f6,$f2\n"
++	"mov.d	$f10,$f8\n"
++	"paddsh	$f2,$f2,$f20\n"
++	"dli $12,%20\n"
++	"dmtc1	$12,$f16\n"
++	"psrah	$f2,$f2,$f16\n"
++	"paddsh	$f8,$f8,$f0\n"
++	"psrah	$f8,$f8,$f16\n"
++	"psubsh	$f10,$f10,$f0\n"
++	"ldc1	$f0,%12\n"
++	"psubsh	$f6,$f6,$f20\n"
++	"psrah	$f10,$f10,$f16\n"
++	"mov.d	$f20,$f14\n"
++	"sdc1	$f8,%2\n"
++	"psrah	$f6,$f6,$f16\n"
++	"sdc1	$f2,%3\n"
++	"paddsh	$f14,$f14,$f0\n"
++	"ldc1	$f8,%13\n"
++	"psubsh	$f20,$f20,$f0\n"
++	"psrah	$f14,$f14,$f16\n"
++	"mov.d	$f2,$f4\n"
++	"sdc1	$f6,%1\n"
++	"psubsh	$f2,$f2,$f8\n"
++	"psrah	$f20,$f20,$f16\n"
++	"paddsh	$f8,$f8,$f4\n"
++	"sdc1	$f14,%4\n"
++	"psrah	$f2,$f2,$f16\n"
++	"sdc1	$f10,%5\n"
++	"psrah	$f8,$f8,$f16\n"
++	"sdc1	$f20,%6\n"
++	"sdc1	$f2,%7\n"
++	"sdc1	$f8,%0\n"
++	".set\treorder\n"
++//	".set\tmips0\n"
++	:"=m"(*(col+offset+3*8)),"=m"(*(col+offset+5*8)),"=m"(*(col+offset+1*8)),"=m"(*(col+offset+2*8)),"=m"(*(col+offset+0*8)),"=m"(*(col+offset+6*8)),"=m"(*(col+offset+7*8)),"=m"(*(col+offset+4*8))
++	:"m"(*_T1),"m"(*(col+offset+1*8)),"m"(*(col+offset+7*8)),"m"(*_T3),"m"(*(col+offset+5*8)),"m"(*(col+offset+3*8)),"m"(*_T2),"m"(*(col+offset+2*8)),"m"(*(col+offset+6*8)),"m"(*(col+offset+0*8)),"m"(*_C4),"m"(*(col+offset+4*8)),"i"(COL_SHIFT)
++	:"$f0","$f2","$f4","$f6","$f8","$f10","$14","$f16","$20","$f22","$12","memory" 
++	);
++}
++
++static const int32_t rounder0[] ATTR_ALIGN(8) =
++    rounder ((1 << (COL_SHIFT - 1)) - 0.5);
++static const int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
++static const int32_t rounder1[] ATTR_ALIGN(8) =
++    rounder (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
++static const int32_t rounder7[] ATTR_ALIGN(8) =
++    rounder (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
++static const int32_t rounder2[] ATTR_ALIGN(8) =
++    rounder (0.60355339059);	/* C2 * (C6+C2)/2 */
++static const int32_t rounder6[] ATTR_ALIGN(8) =
++    rounder (-0.25);		/* C2 * (C6-C2)/2 */
++static const int32_t rounder3[] ATTR_ALIGN(8) =
++    rounder (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
++static const int32_t rounder5[] ATTR_ALIGN(8) =
++    rounder (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
++
++
++#undef COL_SHIFT
++#undef ROW_SHIFT
++
++
++#define declare_idct(idct,table,idct_row_head,idct_row,idct_row_tail,idct_row_mid)	\
++inline void idct (int16_t * const block)				\
++{									\
++    static const int16_t table04[] ATTR_ALIGN(16) =			\
++	table (22725, 21407, 19266, 16384, 12873,  8867, 4520);		\
++    static const int16_t table17[] ATTR_ALIGN(16) =			\
++	table (31521, 29692, 26722, 22725, 17855, 12299, 6270);		\
++    static const int16_t table26[] ATTR_ALIGN(16) =			\
++	table (29692, 27969, 25172, 21407, 16819, 11585, 5906);		\
++    static const int16_t table35[] ATTR_ALIGN(16) =			\
++	table (26722, 25172, 22654, 19266, 15137, 10426, 5315);		\
++									\
++    idct_row_head (block, 0*8, table04);				\
++    idct_row (table04, rounder0);					\
++    idct_row_mid (block, 0*8, 4*8, table04);				\
++    idct_row (table04, rounder4);					\
++    idct_row_mid (block, 4*8, 1*8, table17);				\
++    idct_row (table17, rounder1);					\
++    idct_row_mid (block, 1*8, 7*8, table17);				\
++    idct_row (table17, rounder7);					\
++    idct_row_mid (block, 7*8, 2*8, table26);				\
++    idct_row (table26, rounder2);					\
++    idct_row_mid (block, 2*8, 6*8, table26);				\
++    idct_row (table26, rounder6);					\
++    idct_row_mid (block, 6*8, 3*8, table35);				\
++    idct_row (table35, rounder3);					\
++    idct_row_mid (block, 3*8, 5*8, table35);				\
++    idct_row (table35, rounder5);					\
++    idct_row_tail (block, 5*8);						\
++									\
++    idct_col (block, 0);						\
++    idct_col (block, 4);						\
++}
++
++void ff_loongson2_idct(DCTELEM *block);
++
++declare_idct (ff_loongson2_idct, loongson2_table,
++	      loongson2_row_head, loongson2_row, loongson2_row_tail, loongson2_row_mid)
+diff -Nru ffmpeg.orig/libavcodec/loongson2/idct_loongson2_xvid.c ffmpeg/libavcodec/loongson2/idct_loongson2_xvid.c
+--- ffmpeg.orig/libavcodec/loongson2/idct_loongson2_xvid.c	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/idct_loongson2_xvid.c	2011-12-09 22:38:11.227175456 +0100
+@@ -0,0 +1,301 @@
++/*
++ *  XVID MPEG-4 VIDEO CODEC
++ *
++ *  Copyright(C) 2006-2010 comcat <jiankemeng@gmail.com>
++ *
++ *  Optimized for Loongson2 CPUs by comcat <jiankemeng@gmail.com>
++ * 
++ *  Based on i386
++ *
++ */
++
++
++#include <inttypes.h>
++#include "../avcodec.h"
++
++void ff_idct_xvid_loongson2(short *block);
++
++//=============================================================================
++// Macros and other preprocessor constants
++//=============================================================================
++
++#define BITS_INV_ACC    5                              // 4 or 5 for IEEE
++#define SHIFT_INV_ROW   (16 - BITS_INV_ACC) //11
++#define SHIFT_INV_COL   (1 + BITS_INV_ACC) //6
++#define RND_INV_ROW     (1024 * (6 - BITS_INV_ACC))
++#define RND_INV_COL     (16 * (BITS_INV_ACC - 3))
++#define RND_INV_CORR    (RND_INV_COL - 1)
++
++#define BITS_FRW_ACC    3                              // 2 or 3 for accuracy
++#define SHIFT_FRW_COL   BITS_FRW_ACC
++#define SHIFT_FRW_ROW   (BITS_FRW_ACC + 17)
++#define RND_FRW_ROW     (262144*(BITS_FRW_ACC - 1))
++
++
++//-----------------------------------------------------------------------------
++// Various memory constants (trigonometric values or rounding values)
++//-----------------------------------------------------------------------------
++
++DECLARE_ALIGNED(8, static const int16_t, tg_1_16)[4*4] = {
++  13036,13036,13036,13036,        // tg * (2<<16) + 0.5
++  27146,27146,27146,27146,        // tg * (2<<16) + 0.5
++  -21746,-21746,-21746,-21746,    // tg * (2<<16) + 0.5
++  23170,23170,23170,23170};       // cos * (2<<15) + 0.5
++
++DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2*8] = {
++  65536,65536,
++  3597,3597,
++  2260,2260,
++  1203,1203,
++  0,0,
++  120,120,
++  512,512,
++  512,512};
++
++
++// Table for rows 0,4 - constants are multiplied by cos_4_16
++DECLARE_ALIGNED(8, static const int16_t, tab_i_04_mmx)[32*4] = {
++  16384,16384,16384,-16384,       // movq-> w06 w04 w02 w00
++  21407,8867,8867,-21407,         // w07 w05 w03 w01
++  16384,-16384,16384,16384,       // w14 w12 w10 w08
++  -8867,21407,-21407,-8867,       // w15 w13 w11 w09
++  22725,12873,19266,-22725,       // w22 w20 w18 w16
++  19266,4520,-4520,-12873,        // w23 w21 w19 w17
++  12873,4520,4520,19266,          // w30 w28 w26 w24
++  -22725,19266,-12873,-22725,     // w31 w29 w27 w25
++// Table for rows 1,7 - constants are multiplied by cos_1_16
++  22725,22725,22725,-22725,       // movq-> w06 w04 w02 w00
++  29692,12299,12299,-29692,       // w07 w05 w03 w01
++  22725,-22725,22725,22725,       // w14 w12 w10 w08
++  -12299,29692,-29692,-12299,     // w15 w13 w11 w09
++  31521,17855,26722,-31521,       // w22 w20 w18 w16
++  26722,6270,-6270,-17855,        // w23 w21 w19 w17
++  17855,6270,6270,26722,          // w30 w28 w26 w24
++  -31521,26722,-17855,-31521,     // w31 w29 w27 w25
++// Table for rows 2,6 - constants are multiplied by cos_2_16
++  21407,21407,21407,-21407,       // movq-> w06 w04 w02 w00
++  27969,11585,11585,-27969,       // w07 w05 w03 w01
++  21407,-21407,21407,21407,       // w14 w12 w10 w08
++  -11585,27969,-27969,-11585,     // w15 w13 w11 w09
++  29692,16819,25172,-29692,       // w22 w20 w18 w16
++  25172,5906,-5906,-16819,        // w23 w21 w19 w17
++  16819,5906,5906,25172,          // w30 w28 w26 w24
++  -29692,25172,-16819,-29692,     // w31 w29 w27 w25
++// Table for rows 3,5 - constants are multiplied by cos_3_16
++  19266,19266,19266,-19266,       // movq-> w06 w04 w02 w00
++  25172,10426,10426,-25172,       // w07 w05 w03 w01
++  19266,-19266,19266,19266,       // w14 w12 w10 w08
++  -10426,25172,-25172,-10426,     // w15 w13 w11 w09
++  26722,15137,22654,-26722,       // w22 w20 w18 w16
++  22654,5315,-5315,-15137,        // w23 w21 w19 w17
++  15137,5315,5315,22654,          // w30 w28 w26 w24
++  -26722,22654,-15137,-26722,     // w31 w29 w27 w25
++};
++
++
++// %3 for rows 0,4 - constants are multiplied by cos_4_16
++DECLARE_ALIGNED(8, static const int16_t, tab_i_04_xmm)[32*4] = {
++  16384,21407,16384,8867,      // movq-> w05 w04 w01 w00
++  16384,8867,-16384,-21407,    // w07 w06 w03 w02
++  16384,-8867,16384,-21407,    // w13 w12 w09 w08
++  -16384,21407,16384,-8867,    // w15 w14 w11 w10
++  22725,19266,19266,-4520,     // w21 w20 w17 w16
++  12873,4520,-22725,-12873,    // w23 w22 w19 w18
++  12873,-22725,4520,-12873,    // w29 w28 w25 w24
++  4520,19266,19266,-22725,     // w31 w30 w27 w26
++// %3 for rows 1,7 - constants are multiplied by cos_1_16
++  22725,29692,22725,12299,     // movq-> w05 w04 w01 w00
++  22725,12299,-22725,-29692,   // w07 w06 w03 w02
++  22725,-12299,22725,-29692,   // w13 w12 w09 w08
++  -22725,29692,22725,-12299,   // w15 w14 w11 w10
++  31521,26722,26722,-6270,     // w21 w20 w17 w16
++  17855,6270,-31521,-17855,    // w23 w22 w19 w18
++  17855,-31521,6270,-17855,    // w29 w28 w25 w24
++  6270,26722,26722,-31521,     // w31 w30 w27 w26
++// %3 for rows 2,6 - constants are multiplied by cos_2_16
++  21407,27969,21407,11585,     // movq-> w05 w04 w01 w00
++  21407,11585,-21407,-27969,   // w07 w06 w03 w02
++  21407,-11585,21407,-27969,   // w13 w12 w09 w08
++  -21407,27969,21407,-11585,   // w15 w14 w11 w10
++  29692,25172,25172,-5906,     // w21 w20 w17 w16
++  16819,5906,-29692,-16819,    // w23 w22 w19 w18
++  16819,-29692,5906,-16819,    // w29 w28 w25 w24
++  5906,25172,25172,-29692,     // w31 w30 w27 w26
++// %3 for rows 3,5 - constants are multiplied by cos_3_16
++  19266,25172,19266,10426,     // movq-> w05 w04 w01 w00
++  19266,10426,-19266,-25172,   // w07 w06 w03 w02
++  19266,-10426,19266,-25172,   // w13 w12 w09 w08
++  -19266,25172,19266,-10426,   // w15 w14 w11 w10
++  26722,22654,22654,-5315,     // w21 w20 w17 w16
++  15137,5315,-26722,-15137,    // w23 w22 w19 w18
++  15137,-26722,5315,-15137,    // w29 w28 w25 w24
++  5315,22654,22654,-26722,     // w31 w30 w27 w26
++};
++
++
++
++#define DCT_8_INV_ROW_LOONGSON2(A1,A2,A3,A4)\
++  "ldc1		$f0, " #A1 "           \n\t"/* 0     ; x3 x2 x1 x0*/\
++  "ldc1		$f2, 8+" #A1 "         \n\t"/* 1     ; x7 x6 x5 x4*/\
++  "mov.d	$f4, $f0               \n\t"/* 2     ; x3 x2 x1 x0*/\
++  "ldc1		$f6, " #A3 "           \n\t"/* 3     ; w05 w04 w01 w00*/\
++  "li		$12, 0x88				\n\t"\
++  "dmtc1	$12, $f16				\n\t"\
++  "pshufh	$f0, $f0, $f16         \n\t"/* x2 x0 x2 x0*/\
++  "ldc1		$f8, 8+" #A3 "         \n\t"/* 4     ; w07 w06 w03 w02*/\
++  "mov.d	$f10, $f2              \n\t"/* 5     ; x7 x6 x5 x4*/\
++  "pmaddhw	$f6, $f6, $f0          \n\t"/* x2*w05+x0*w04 x2*w01+x0*w00*/\
++  "ldc1		$f12, 32+" #A3 "       \n\t"/* 6     ; w21 w20 w17 w16*/\
++  "pshufh	$f2, $f2, $f16        \n\t"/* x6 x4 x6 x4*/\
++  "pmaddhw	$f8, $f8, $f2          \n\t"/* x6*w07+x4*w06 x6*w03+x4*w02*/\
++  "li		$12, 0xdd			   \n\t"\
++  "dmtc1	$12, $f16			   \n\t"\
++  "ldc1		$f14, 40+" #A3 "       \n\t"/* 7    ; w23 w22 w19 w18*/\
++  "pshufh	$f4, $f4, $f16         \n\t"/* x3 x1 x3 x1*/\
++  "pmaddhw	$f12, $f12, $f4        \n\t"/* x3*w21+x1*w20 x3*w17+x1*w16*/\
++  "ldc1		$f18, " #A4 "          \n\t" \
++  "ldc1		$f20, 16+" #A3 "	   \n\t" \
++  "ldc1		$f22, 24+" #A3 "	   \n\t" \
++  "ldc1		$f24, 48+" #A3 "	   \n\t" \
++  "ldc1		$f26, 56+" #A3 "	   \n\t" \
++  "pshufh	$f10, $f10, $f16       \n\t"/* x7 x5 x7 x5*/\
++  "pmaddhw	$f14, $f14, $f10       \n\t"/* x7*w23+x5*w22 x7*w19+x5*w18*/\
++  "paddw	$f6, $f6, $f18         \n\t"/* +%4*/\
++  "pmaddhw	$f0, $f0, $f20         \n\t"/* x2*w13+x0*w12 x2*w09+x0*w08*/\
++  "paddw	$f6, $f6, $f8	       \n\t"/* 4     ; a1=sum(even1) a0=sum(even0)*/\
++  "pmaddhw	$f2, $f2, $f22         \n\t"/* x6*w15+x4*w14 x6*w11+x4*w10*/\
++  "mov.d	$f8, $f6               \n\t"/* 4     ; a1 a0*/\
++  "li		$12, 11				   \n\t"\
++  "dmtc1	$12, $f16			   \n\t"\
++  "pmaddhw	$f4, $f4, $f24		   \n\t"/* x3*w29+x1*w28 x3*w25+x1*w24*/\
++  "paddw	$f12, $f12, $f14       \n\t"/* 7     ; b1=sum(odd1) b0=sum(odd0)*/\
++  "pmaddhw	$f10, $f10, $f26	   \n\t"/* x7*w31+x5*w30 x7*w27+x5*w26*/\
++  "paddw	$f6, $f6, $f12         \n\t"/* a1+b1 a0+b0*/\
++  "paddw	$f0, $f0, $f18         \n\t"/* +%4*/\
++  "psraw	$f6, $f6, $f16		   \n\t"/* y1=a1+b1 y0=a0+b0*/\
++  "paddw	$f0, $f0, $f2          \n\t"/* 1     ; a3=sum(even3) a2=sum(even2)*/\
++  "psubw	$f8, $f8, $f12         \n\t"/* 6     ; a1-b1 a0-b0*/\
++  "mov.d	$f14, $f0              \n\t"/* 7     ; a3 a2*/\
++  "paddw	$f4, $f4, $f10         \n\t"/* 5     ; b3=sum(odd3) b2=sum(odd2)*/\
++  "paddw	$f0, $f0, $f4          \n\t"/* a3+b3 a2+b2*/\
++  "psraw	$f8, $f8, $f16	       \n\t"/* y6=a1-b1 y7=a0-b0*/\
++  "psubw 	$f14, $f14, $f4        \n\t"/* 2     ; a3-b3 a2-b2*/\
++  "psraw	$f0, $f0, $f16     	   \n\t"/* y3=a3+b3 y2=a2+b2*/\
++  "psraw	$f14, $f14, $f16	   \n\t"/* y4=a3-b3 y5=a2-b2*/\
++  "li		$12, 0xb1			   \n\t"\
++  "dmtc1	$12, $f20			   \n\t"\
++  "packsswh $f6, $f6, $f0          \n\t"/* 0     ; y3 y2 y1 y0*/\
++  "packsswh $f14, $f14, $f8        \n\t"/* 4     ; y6 y7 y4 y5*/\
++  "sdc1		$f6, " #A2 "           \n\t"/* 3     ; save y3 y2 y1 y0*/\
++  "pshufh	$f14, $f14, $f20      \n\t"/* y7 y6 y5 y4*/\
++  "sdc1		$f14, 8 +" #A2 "	   \n\t"/* 7     ; save y7 y6 y5 y4*/
++
++
++#define DCT_8_INV_COL(A1,A2)\
++  "ldc1		$f0, 2*8(%3)			\n\t"/* */\
++  "ldc1		$f6, 16*3+" #A1 "		\n\t"/* x3 */\
++  "mov.d	$f2, $f0				\n\t"/* tg_3_16*/\
++  "ldc1		$f10, 16*5+" #A1 "		\n\t"/* x5 */\
++  "pmulhh 	$f0, $f0, $f6 			\n\t"/* x3*(tg_3_16-1)*/\
++  "ldc1 	$f8, (%3)				\n\t"\
++  "pmulhh	$f2, $f2, $f10			\n\t"/* x5*(tg_3_16-1)*/\
++  "ldc1 	$f14, 16*7+" #A1 "		\n\t"/* x7 */\
++  "mov.d	$f4, $f8				\n\t"/* tg_1_16*/\
++  "ldc1		$f12, 16*1+" #A1 "		\n\t"/* x1 */\
++  "pmulhh 	$f8, $f8, $f14			\n\t"/* x7*tg_1_16*/\
++  "paddsh	$f0, $f0, $f6			\n\t"/* x3*tg_3_16*/\
++  "pmulhh	$f4, $f4, $f12			\n\t"/* x1*tg_1_16*/\
++  "paddsh	$f2, $f2, $f6			\n\t"/* x3+x5*(tg_3_16-1)*/\
++  "psubsh	$f0, $f0, $f10			\n\t"/* x3*tg_3_16-x5 = tm35*/\
++  "ldc1		$f6, 3*8(%3)			\n\t"\
++  "paddsh	$f2, $f2, $f10			\n\t"/* x3+x5*tg_3_16 = tp35*/\
++  "paddsh	$f8, $f8, $f12			\n\t"/* x1+tg_1_16*x7 = tp17*/\
++  "psubsh	$f4, $f4, $f14			\n\t"/* x1*tg_1_16-x7 = tm17*/\
++  "mov.d	$f10, $f8				\n\t"/* tp17*/\
++  "mov.d	$f12, $f4				\n\t"/* tm17*/\
++  "paddsh	$f10, $f10, $f2			\n\t"/* tp17+tp35 = b0*/\
++  "psubsh	$f12, $f12, $f0			\n\t"/* tm17-tm35 = b3*/\
++  "psubsh	$f8, $f8, $f2			\n\t"/* tp17-tp35 = t1*/\
++  "paddsh	$f4, $f4, $f0			\n\t"/* tm17+tm35 = t2*/\
++  "ldc1		$f14, 1*8(%3)			\n\t"\
++  "mov.d	$f2, $f8				\n\t"/* t1*/\
++  "sdc1		$f10, 3*16+" #A2 "		\n\t"/* save b0*/\
++  "paddsh	$f2, $f2, $f4			\n\t"/* t1+t2*/\
++  "sdc1		$f12, 5*16+" #A2 "		\n\t"/* save b3*/\
++  "psubsh	$f8, $f8, $f4			\n\t"/* t1-t2*/\
++  "ldc1		$f10, 2*16+" #A1 "		\n\t"\
++  "mov.d	$f0, $f14				\n\t"/* tg_2_16*/\
++  "ldc1		$f12, 6*16+" #A1 "		\n\t"\
++  "pmulhh	$f0, $f0, $f10			\n\t"/* x2*tg_2_16*/\
++  "pmulhh	$f14, $f14, $f12		\n\t"/* x6*tg_2_16*/\
++  "pmulhh	$f2, $f2, $f6			\n\t"/* ocos_4_16*(t1+t2) = b1/2*/\
++  "ldc1		$f4, 0*16+" #A1 "		\n\t"\
++  "pmulhh 	$f8, $f8, $f6			\n\t"/* ocos_4_16*(t1-t2) = b2/2*/\
++  "psubsh	$f0, $f0, $f12			\n\t"/* t2*tg_2_16-x6 = tm26*/\
++  "mov.d 	$f6, $f4				\n\t"/* x0*/\
++  "ldc1		$f12, 4*16+" #A1 "		\n\t"\
++  "paddsh 	$f14, $f14, $f10		\n\t"/* x2+x6*tg_2_16 = tp26*/\
++  "paddsh 	$f4, $f4, $f12			\n\t"/* x0+x4 = tp04*/\
++  "psubsh 	$f6, $f6, $f12			\n\t"/* x0-x4 = tm04*/\
++  "mov.d	$f10, $f4				\n\t"/* tp04*/\
++  "mov.d 	$f12, $f6				\n\t"/* tm04*/\
++  "psubsh 	$f4, $f4, $f14			\n\t"/* tp04-tp26 = a3*/\
++  "paddsh 	$f6, $f6, $f0			\n\t"/* tm04+tm26 = a1*/\
++  "paddsh 	$f2, $f2, $f2			\n\t"/* b1*/\
++  "paddsh 	$f8, $f8, $f8			\n\t"/* b2*/\
++  "paddsh	$f10, $f10, $f14		\n\t"/* tp04+tp26 = a0*/\
++  "psubsh	$f12, $f12, $f0			\n\t"/* tm04-tm26 = a2*/\
++  "li		$12, 6					\n\t"\
++  "dmtc1	$12, $f18				\n\t"\
++  "mov.d	$f14, $f6				\n\t"/* a1*/\
++  "mov.d	$f0, $f12				\n\t"/* a2*/\
++  "paddsh 	$f6, $f6, $f2			\n\t"/* a1+b1*/\
++  "paddsh 	$f12, $f12, $f8			\n\t"/* a2+b2*/\
++  "psrah 	$f6, $f6, $f18			\n\t"/* dst1*/\
++  "psubsh 	$f14, $f14, $f2			\n\t"/* a1-b1*/\
++  "psrah 	$f12, $f12, $f18		\n\t"/* dst2*/\
++  "psubsh 	$f0, $f0, $f8			\n\t"/* a2-b2*/\
++  "ldc1		$f2, 3*16+" #A2 "		\n\t"/* load b0*/\
++  "psrah 	$f14, $f14, $f18		\n\t"/* dst6*/\
++  "mov.d	$f8, $f10				\n\t"/* a0*/\
++  "psrah 	$f0, $f0, $f18			\n\t"/* dst5*/\
++  "sdc1		$f6, 1*16+" #A2 "		\n\t"\
++  "paddsh 	$f10, $f10, $f2			\n\t"/* a0+b0*/\
++  "sdc1		$f12, 2*16+" #A2 "		\n\t"\
++  "psubsh 	$f8, $f8, $f2			\n\t"/* a0-b0*/\
++  "ldc1		$f6, 5*16+" #A2 "		\n\t"/* load b3*/\
++  "psrah	$f10, $f10, $f18		\n\t"/* dst0*/\
++  "mov.d	$f12, $f4				\n\t"/* a3*/\
++  "psrah 	$f8, $f8, $f18			\n\t"/* dst7*/\
++  "sdc1		$f0, 5*16+" #A2 "		\n\t"\
++  "paddsh 	$f4, $f4, $f6			\n\t"/* a3+b3*/\
++  "sdc1		$f14, 6*16+" #A2 "		\n\t"\
++  "psubsh 	$f12, $f12, $f6			\n\t"/* a3-b3*/\
++  "sdc1		$f10, 0*16+" #A2 "		\n\t"\
++  "psrah 	$f4, $f4, $f18 			\n\t"/* dst3*/\
++  "sdc1		$f8, 7*16+" #A2 "		\n\t"\
++  "psrah 	$f12, $f12, $f18		\n\t"/* dst4*/\
++  "sdc1		$f4, 3*16+" #A2 "		\n\t"\
++  "sdc1		$f12, 4*16+" #A2 "		\n\t"
++
++
++
++void ff_idct_xvid_loongson2(short *block){
++	__asm__ volatile(
++	//# Process each row
++    DCT_8_INV_ROW_LOONGSON2(0*16(%0), 0*16(%0), 64*0(%2), 8*0(%1))
++    DCT_8_INV_ROW_LOONGSON2(1*16(%0), 1*16(%0), 64*1(%2), 8*1(%1))
++    DCT_8_INV_ROW_LOONGSON2(2*16(%0), 2*16(%0), 64*2(%2), 8*2(%1))
++    DCT_8_INV_ROW_LOONGSON2(3*16(%0), 3*16(%0), 64*3(%2), 8*3(%1))
++    DCT_8_INV_ROW_LOONGSON2(4*16(%0), 4*16(%0), 64*0(%2), 8*4(%1))
++    DCT_8_INV_ROW_LOONGSON2(5*16(%0), 5*16(%0), 64*3(%2), 8*5(%1))
++    DCT_8_INV_ROW_LOONGSON2(6*16(%0), 6*16(%0), 64*2(%2), 8*6(%1))
++    DCT_8_INV_ROW_LOONGSON2(7*16(%0), 7*16(%0), 64*1(%2), 8*7(%1))
++
++	//# Process the columns (4 at a time)
++    DCT_8_INV_COL(0(%0), 0(%0))
++    DCT_8_INV_COL(8(%0), 8(%0))
++    :
++    : "r"(block), "r"(rounder_0), "r"(tab_i_04_xmm), "r"(tg_1_16)
++    :"$f0","$f2","$f4","$f6","$f8","$f10","$f12","$f14","$f18","$f16","$20","$22","$24","$26");
++}
+diff -Nru ffmpeg.orig/libavcodec/loongson2/motion_est_loongson2.c ffmpeg/libavcodec/loongson2/motion_est_loongson2.c
+--- ffmpeg.orig/libavcodec/loongson2/motion_est_loongson2.c	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/motion_est_loongson2.c	2011-12-09 23:25:15.247445391 +0100
+@@ -0,0 +1,365 @@
++/*
++ * Loongson2E MMI optimized motion estimation
++ * Copyright (c) 2007 comcat <jiankemeng@gmail.com>.
++ *
++ * based on Michael Niedermayer <michaelni@gmx.at>
++ *
++ */
++
++#include "dsputil_loongson2.h"
++#include "../avcodec.h"
++
++DECLARE_ASM_CONST(8, uint64_t, round_tab)[3]={
++	0x0000000000000000ULL,
++	0x0001000100010001ULL,
++	0x0002000200020002ULL,
++};
++
++DECLARE_ASM_CONST(8, uint64_t, bone)= 0x0101010101010101LL;
++
++static inline void sad8_1_loongson2(uint8_t *blk1, uint8_t *blk2, int stride, int h)
++{
++    long len= -(stride*h);
++    __asm__ volatile(
++        
++//		".set mips3						\n\t"
++		".align 4						\n\t"
++
++		"move	$8, %0					\n\t"
++		"move	$21, %1					\n\t"
++		"move	$22, %2					\n\t"
++		"move	$23, %3					\n\t"
++
++        "1:                             \n\t"
++
++		"add	$9, $8, $21				\n\t"
++		"add	$10, $8, $22				\n\t"
++        
++		"uld	$11, ($9)				\n\t"
++		"dmtc1	$11, $f0				\n\t"
++
++		"uld	$12, ($9)				\n\t"
++		"dmtc1	$12, $f4				\n\t"
++        
++		"pasubub $f10, $f0, $f4			\n\t"
++		"biadd	 $f0, $f10				\n\t"
++
++		"add	$8, $8, $23				\n\t"
++
++		"add	$9, $8, $21				\n\t"
++		"add	$10, $8, $22				\n\t"
++        
++		"uld	$11, ($9)				\n\t"
++		"dmtc1	$11, $f2				\n\t"
++		
++		"uld	$12, ($10)				\n\t"
++		"dmtc1	$12, $f6				\n\t"
++
++		"pasubub $f16, $f2, $f6			\n\t"
++		"biadd	 $f6, $f16				\n\t"
++        
++		"paddh	 $f0, $f0, $f6			\n\t"
++        
++		"paddh	 $f12, $f12, $f0		\n\t"
++		
++		"bltz	$8, 1b					\n\t"		
++		"add	$8, $8, $23				\n\t" 
++
++        : "+r" (len)
++        : "r" (blk1 - len), "r" (blk2 - len), "r" ((long)stride)
++		: "$8", "$9", "$10", "$21", "$22", "$23", "$f0", "$f2", "$f4", "$f6", "$f10", "$f16"
++    );
++}
++
++static inline void sad8_2_loongson2(uint8_t *blk1a, uint8_t *blk1b, uint8_t *blk2, int stride, int h)
++{
++    long len= -(stride*h);
++    __asm__ volatile(
++        
++//		".set mips3						\n\t"
++		".align 4						\n\t"
++
++		"move	$8, %0					\n\t"
++
++        "1:                             \n\t"
++		"add	$9, $8, %1				\n\t"
++		"add	$10, $8, %2				\n\t"
++		"add	$11, $8, %3				\n\t"
++
++		"uld	$12, ($9)				\n\t"
++		"dmtc1	$12, $f0				\n\t"
++		"uld	$13, ($10)				\n\t"
++		"dmtc1	$13, $f4				\n\t"
++
++		"pavgb	$f0, $f0, $f4			\n\t"
++		
++		"uld	$12, ($11)				\n\t"
++		"dmtc1	$12, $f4				\n\t"
++
++		"pasubub $f10, $f0, $f4			\n\t"
++		"biadd	 $f0, $f10				\n\t"
++        
++		"add	$8, $8, %4				\n\t"
++
++		"add	$9, $8, %1				\n\t"
++		"add	$10, $8, %2				\n\t"
++		"add	$11, $8, %3				\n\t"
++
++		"uld	$12, ($9)				\n\t"
++		"dmtc1	$12, $f2				\n\t"
++		"uld	$13, ($10)				\n\t"
++		"dmtc1	$13, $f6				\n\t"
++        
++		"pavgb	$f6, $f6, $f2			\n\t"
++		
++		"uld	$12, ($11)				\n\t"
++		"dmtc1	$12, $f2				\n\t"
++        
++		"pasubub $f16, $f6, $f2			\n\t"
++		"biadd	 $f6, $f16				\n\t"
++        
++		"paddh	 $f0, $f0, $f6			\n\t"
++		"paddh	 $f12, $f12, $f0		\n\t"
++
++		"bltz	$8, 1b					\n\t"
++		"add	$8, $8, %4				\n\t"
++        : "+r" (len)
++        : "r" (blk1a - len), "r" (blk1b -len), "r" (blk2 - len), "r" ((long)stride)
++		: "$8", "$9", "$10", "$11", "$12", "$13", "$f0", "$f2", "$f4", "$f6", "$f10", "$f16"
++    );
++}
++
++static inline void sad8_4_loongson2(uint8_t *blk1, uint8_t *blk2, int stride, int h)
++{ 
++    long len= -(stride*h);
++    __asm__ volatile(
++        
++        
++//		".set mips3						\n\t"
++		".align 4						\n\t"
++
++		"ldc1	$f10, "MANGLE(bone)"	\n\t"
++
++		"move	$8, %0					\n\t"
++
++        "1:                             \n\t"
++		"add	$9, $8, %1				\n\t"
++		"add	$10, $8, %2				\n\t"
++		"add	$11, $8, %3				\n\t"
++        
++		"uld	$12, ($9)				\n\t"
++		"dmtc1	$12, $f0				\n\t"
++		
++		"uld	$13, ($10)				\n\t"
++		"dmtc1	$13, $f4				\n\t"
++		
++		"uld	$12, 1($9)				\n\t"
++		"dmtc1	$12, $f2				\n\t"
++		
++		"uld	$13, 1($10)				\n\t"
++		"dmtc1	$13, $f6				\n\t"
++
++		"pavgb	$f0, $f0, $f4			\n\t"
++		"pavgb	$f6, $f6, $f2			\n\t"
++        
++		"psubusb $f6, $f6, $f10			\n\t"
++		"pavgb	 $f0, $f0, $f6			\n\t"
++
++		"uld	$13, 1($11)				\n\t"
++		"dmtc1	$13, $f4				\n\t"
++        
++		"pasubub $f16, $f0, $f4			\n\t"
++		"biadd	 $f0, $f16				\n\t"
++
++		"add	 $8, $8, %4				\n\t"
++
++		"add	$9, $8, %1				\n\t"
++		"add	$10, $8, %2				\n\t"
++		"add	$11, $8, %3				\n\t"
++
++		"uld	$12, ($9)				\n\t"
++		"dmtc1	$12, $f2				\n\t"
++		"uld	$13, ($10)				\n\t"
++		"dmtc1	$12, $f6				\n\t"
++		"uld	$12, 1($9)				\n\t"
++		"dmtc1	$12, $f4				\n\t"
++		"uld	$13, 1($10)				\n\t"
++		"dmtc1	$12, $f8				\n\t"
++
++		"pavgb	$f2, $f2, $f6			\n\t"
++		"pavgb	$f4, $f4, $f8			\n\t"
++        
++		"psubusb $f4, $f4, $f10			\n\t"
++		"pavgb	 $f4, $f4, $f2			\n\t"
++
++		"uld	$13, ($11)				\n\t"
++		"dmtc1	$13, $f2				\n\t"
++
++		"pasubub $f18, $f4, $f2			\n\t"
++		"biadd	 $f4, $f18				\n\t"
++        
++		"paddh	 $f0, $f0, $f4			\n\t"
++		"paddh	 $f12, $f12, $f0		\n\t"
++        
++		"bltz	 $8, 1b					\n\t"
++		"add	 $8, $8, %4				\n\t"
++        : "+r" (len)
++        : "r" (blk1 - len), "r" (blk1 - len + stride), "r" (blk2 - len), "r" ((long)stride)
++		: "$8", "$9", "$10", "$11", "$12", "$13", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f16", "$f18"
++    );
++}
++
++static inline int sum_loongson2(void)
++{
++    int ret;
++    __asm__ volatile(
++//		".set mips3						\n\t"
++        
++		"dmfc1	%0, $f12				\n\t"
++        : "=r" (ret)
++    );
++    return ret;
++}
++
++
++static int sad8_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    assert(h==8);
++    __asm__ volatile(
++//			".set mips3						\n\t"
++			"xor	$f14, $f14, $f14 \n\t"
++			"xor	$f12, $f12, $f12 \n\t"
++			:
++	);
++
++    sad8_1_loongson2(blk1, blk2, stride, 8);
++
++    return sum_loongson2();
++}
++
++static int sad8_x2_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    assert(h==8);
++    __asm__ volatile(
++//			".set mips3						\n\t"
++			"xor	$f14, $f14, $f14	\n\t"
++			"xor	$f12, $f12, $f12	\n\t"
++            
++			"ldc1	$f10, %0		 \n\t"
++            :: "m"(round_tab[1]) 
++    );
++
++    sad8_2_loongson2(blk1, blk1+1, blk2, stride, 8);
++
++    return sum_loongson2();
++}
++
++static int sad8_y2_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    assert(h==8);
++    __asm__ volatile(
++//				 ".set mips3				\n\t"
++				 "xor	$f14, $f14, $f14	\n\t"
++				 "xor	$f12, $f12, $f12	\n\t"
++                 
++				 "ldc1	$f10, %0		 \n\t"
++                 :: "m"(round_tab[1]) 
++                 );
++
++    sad8_2_loongson2(blk1, blk1+stride, blk2, stride, 8);
++
++    return sum_loongson2();
++}
++
++static int sad8_xy2_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    assert(h==8);
++    __asm__ volatile(
++//				 ".set mips3				\n\t"
++				 "xor	$f14, $f14, $f14	\n\t"
++				 "xor	$f12, $f12, $f12	\n\t"
++				 "ldc1	$f10, %0		 \n\t"
++                 :: "m"(round_tab[2]) 
++                 );
++
++    sad8_4_loongson2(blk1, blk2, stride, 8);
++
++    return sum_loongson2();
++}
++
++static int sad16_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    __asm__ volatile(
++//				 ".set mips3			\n\t"
++				 "xor	$f14, $f14, $f14	\n\t"
++				 "xor	$f12, $f12, $f12	\n\t":);
++
++    sad8_1_loongson2(blk1  , blk2  , stride, h);
++    sad8_1_loongson2(blk1+8, blk2+8, stride, h);
++
++    return sum_loongson2();
++}
++
++static int sad16_x2_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    __asm__ volatile(
++//				 ".set mips3				\n\t"
++				 "xor	$f14, $f14, $f14	\n\t"
++				 "xor	$f12, $f12, $f12	\n\t"
++				 "ldc1	$f10, %0		 \n\t"
++                 :: "m"(round_tab[1]) 
++                 );
++
++    sad8_2_loongson2(blk1  , blk1+1, blk2  , stride, h);
++    sad8_2_loongson2(blk1+8, blk1+9, blk2+8, stride, h);
++
++    return sum_loongson2();
++}
++
++static int sad16_y2_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    __asm__ volatile(
++//				 ".set mips3				\n\t"
++				 "xor	$f14, $f14, $f14	\n\t"
++				 "xor	$f12, $f12, $f12	\n\t"
++				 "ldc1	$f10, %0		 \n\t"
++                 :: "m"(round_tab[1]) 
++                 );
++
++    sad8_2_loongson2(blk1  , blk1+stride,  blk2  , stride, h);
++    sad8_2_loongson2(blk1+8, blk1+stride+8,blk2+8, stride, h);
++
++    return sum_loongson2();
++}
++
++static int sad16_xy2_loongson2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h)
++{
++    __asm__ volatile(
++//				 ".set mips3				\n\t"
++				 "xor	$f14, $f14, $f14	\n\t"
++				 "xor	$f12, $f12, $f12	\n\t"
++				 "ldc1	$f10, %0		 \n\t"
++                 :: "m"(round_tab[2]) 
++                 );
++
++    sad8_4_loongson2(blk1  , blk2  , stride, h);
++    sad8_4_loongson2(blk1+8, blk2+8, stride, h);
++
++    return sum_loongson2();
++}
++
++
++void dsputil_init_pix_loongson2(DSPContext* c, AVCodecContext *avctx)
++{
++        c->pix_abs[0][0] = sad16_loongson2;
++        c->pix_abs[0][1] = sad16_x2_loongson2;
++        c->pix_abs[0][2] = sad16_y2_loongson2;
++        c->pix_abs[0][3] = sad16_xy2_loongson2;
++        c->pix_abs[1][0] = sad8_loongson2;
++        c->pix_abs[1][1] = sad8_x2_loongson2;
++        c->pix_abs[1][2] = sad8_y2_loongson2;
++        c->pix_abs[1][3] = sad8_xy2_loongson2;
++
++        c->sad[0]= sad16_loongson2;
++        c->sad[1]= sad8_loongson2;
++}
+diff -Nru ffmpeg.orig/libavcodec/loongson2/mpegvideo_loongson2.c ffmpeg/libavcodec/loongson2/mpegvideo_loongson2.c
+--- ffmpeg.orig/libavcodec/loongson2/mpegvideo_loongson2.c	1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg/libavcodec/loongson2/mpegvideo_loongson2.c	2011-12-09 21:40:50.828821027 +0100
+@@ -0,0 +1,385 @@
++/*
++ * The simplest mpeg encoder (well, it was the simplest!)
++ * Copyright (c) 2007-2010 comcat <jiankemeng@gmail.com>.
++ *
++ * Optimized for Loongson2 CPUs by comcat <jiankemeng@gmail.com>
++ * 
++ * Based on i386
++ */
++
++#include "dsputil_loongson2.h"
++#include "../mpegvideo.h"
++#include "../avcodec.h"
++
++extern uint8_t zigzag_direct_noperm[64];
++extern uint16_t inv_zigzag_direct16[64];
++
++static const unsigned long long int mm_wabs __attribute__ ((aligned(8))) = 0xffffffffffffffffULL;
++static const unsigned long long int mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
++
++
++static void dct_unquantize_h263_intra_loongson2(MpegEncContext *s,
++                                  DCTELEM *block, int n, int qscale)
++{
++    long level, qmul, qadd, nCoeffs;
++
++    qmul = qscale << 1;
++
++    assert(s->block_last_index[n]>=0 || s->h263_aic); 
++    if (!s->h263_aic) {
++        if (n < 4)
++            level = block[0] * s->y_dc_scale;
++        else
++            level = block[0] * s->c_dc_scale;
++        qadd = (qscale - 1) | 1;
++    }else{
++        qadd = 0;
++        level= block[0];
++    }
++    if(s->ac_pred)
++        nCoeffs=63;
++    else
++        nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
++
++
++	__asm__ volatile(
++//			".set mips3						\n\t"
++			
++			"xor		$f12, $f12, $f12	\n\t"
++			"lwc1		$f12, %1			\n\t"
++			
++			"xor		$f10, $f10, $f10	\n\t"
++			
++			"packsswh	$f12, $f12, $f12	\n\t"
++			
++			"lwc1		$f10, %2			\n\t"
++			
++			"packsswh	$f10, $f10, $f10	\n\t"
++			
++			"packsswh	$f12, $f12, $f12	\n\t"
++			
++			"xor 		$f14, $f14, $f14	\n\t"
++			
++			"packsswh	$f10, $f10, $f10	\n\t"
++			
++			"xor		$f8, $f8, $f8		\n\t"
++			
++			"psubh		$f14, $f14, $f10	\n\t"
++
++			
++			"1:                             \n\t"
++			"add		$12, %0, %3			\n\t"
++			
++			"ldc1		$f0, ($12)			\n\t"
++			
++			"ldc1		$f2, 8($12)			\n\t"
++
++			"mov.d		$f4, $f0			\n\t"
++			"mov.d		$f6, $f2			\n\t"
++			
++			"pmullh		$f0, $f0, $f12		\n\t"
++			"pmullh		$f2, $f2, $f12		\n\t"
++
++			"pcmpgth	$f4, $f4, $f8		\n\t"
++			"pcmpgth	$f6, $f6, $f8		\n\t"
++			
++			"xor		$f0, $f0, $f4		\n\t"
++			"xor		$f2, $f2, $f6		\n\t"
++
++			
++			"paddh		$f0, $f0, $f14      \n\t"
++			
++			"paddh		$f2, $f2, $f14		\n\t"
++
++			
++			"xor		$f4, $f4, $f0		\n\t"
++			
++			"xor		$f6, $f6, $f2		\n\t"
++
++			
++			"pcmpeqh	$f0, $f0, $f14		\n\t"
++			
++			"pcmpeqh	$f2, $f2, $f14		\n\t"
++
++			
++			"pandn		$f0, $f0, $f4		\n\t"	
++			
++			"pandn		$f2, $f2, $f6		\n\t"
++
++			
++			"sdc1		$f0, ($12)			\n\t"
++			
++			"sdc1		$f2, 8($12)			\n\t"
++
++			
++			"addiu		%3, %3, 16			\n\t"
++			
++			"blez		%3, 1b				\n\t"
++			"nop							\n\t"
++			::"r" (block+nCoeffs), "m"(qmul), "m" (qadd), "r" (2*(-nCoeffs))
++			: "memory"
++        );
++        block[0]= level;
++}
++
++
++static void dct_unquantize_h263_inter_loongson2(MpegEncContext *s,
++                                  DCTELEM *block, int n, int qscale)
++{
++    long qmul, qadd, nCoeffs;
++
++    qmul = qscale << 1;
++    qadd = (qscale - 1) | 1;
++
++    assert(s->block_last_index[n]>=0 || s->h263_aic);
++
++    nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
++
++   __asm__ volatile(
++//				".set mips3						\n\t"
++                
++				"xor		$f12, $f12, $f12	\n\t"
++				"lwc1		$f12, %1			\n\t"
++                
++				"xor		$f10, $f10, $f10	\n\t"
++                
++				"packsswh	$f12, $f12, $f12	\n\t"
++
++				"lwc1		$f10, %2			\n\t"
++                
++				"packsswh	$f10, $f10, $f10	\n\t"
++                
++				"xor		$f14, $f14, $f14	\n\t"
++                
++				"packsswh	$f12, $f12, $f12	\n\t"
++                
++				"packsswh	$f10, $f10, $f10	\n\t"
++                
++				"xor		$f8, $f8, $f8		\n\t"
++
++				"psubh		$f14, $f14, $f10	\n\t"
++                
++
++                "1:                             \n\t"
++				"add		$12, %0, %3			\n\t"
++                
++				"ldc1		$f0, ($12)			\n\t"
++                
++				"ldc1		$f2, 8($12)			\n\t"
++
++				"mov.d		$f4, $f0			\n\t"
++				"mov.d		$f6, $f2			\n\t"
++                
++				"pmullh		$f0, $f0, $f12		\n\t"
++                
++				"pmullh		$f2, $f2, $f12		\n\t"
++
++				"pcmpgth	$f4, $f4, $f8		\n\t"
++                
++				"pcmpgth	$f6, $f6, $f8		\n\t"
++                
++				"xor		$f0, $f0, $f4		\n\t"
++                
++				"xor		$f2, $f2, $f6		\n\t"
++                
++				"paddh		$f0, $f0, $f14		\n\t"
++                
++				"paddh		$f2, $f2, $f14		\n\t"
++                
++				"xor		$f4, $f4, $f0		\n\t"
++                
++				"xor		$f6, $f6, $f2		\n\t"
++                
++				"pcmpeqh	$f0, $f0, $f14		\n\t"
++                
++				"pcmpeqh	$f2, $f2, $f14		\n\t"
++                
++				"pandn		$f0, $f0, $f4		\n\t"
++                
++				"pandn		$f2, $f2, $f6		\n\t"
++                
++				"sdc1		$f0, ($12)			\n\t"
++                
++				"sdc1		$f2, 8($12)			\n\t"
++
++                
++				"addiu		%3, %3, 16			\n\t"
++                
++				"blez		%3, 1b				\n\t"
++				"nop							\n\t"
++                ::"r" (block+nCoeffs), "m"(qmul), "m" (qadd), "r" (2*(-nCoeffs))
++                : "memory"
++        );
++}
++
++
++/* draw the edges of width 'w' of an image of size width, height
++   this mmx version can only handle w==8 || w==16 */
++
++static void draw_edges_loongson2(uint8_t *buf, int wrap, int width, int height, int w)
++{
++    uint8_t *ptr, *last_line;
++    int i;
++
++    last_line = buf + (height - 1) * wrap;
++    
++    ptr = buf;
++    if(w==8)
++    {
++        __asm__ volatile(
++//				".set mips3						\n\t"
++
++				"move		$9, %0				\n\t"
++
++                "1:                             \n\t"
++                
++				"xor		$f0, $f0, $f0		\n\t"
++				"lwc1		$f0, ($9)			\n\t"
++                
++				"punpcklbh	$f0, $f0, $f0		\n\t"
++
++				"add		$12, $9, %2			\n\t"
++                
++				"punpcklhw	$f0, $f0, $f0		\n\t"
++
++				"punpcklwd	$f0, $f0, $f0		\n\t"
++
++				"ldc1		$f2, -8($12)		\n\t"
++
++				"sdc1		$f0, -8($9)			\n\t"
++                
++				"punpckhbh	$f2, $f2, $f2		\n\t"
++                
++				"add		$9, $9, %1			\n\t"
++
++				"punpckhhw	$f2, $f2, $f2		\n\t"
++                
++				"sub		$13, $9, %3			\n\t"
++
++				"punpckhwd	$f2, $f2, $f2		\n\t"
++
++				"bltz		$13, 1b				\n\t"
++                
++				"sdc1		$f2, ($12)			\n\t"
++
++                : "+r" (ptr)
++                : "r" ((long)wrap), "r" ((long)width), "r" (ptr + wrap*height)
++				: "$9", "$13", "$12", "$f2", "$f0"
++        );
++    }
++    else
++    {
++        __asm__ volatile(
++//				".set mips3						\n\t"
++
++				"move		$8, %0				\n\t"
++
++                "1:                             \n\t"
++                
++				"xor		$f0, $f0, $f0		\n\t"
++				"lwc1		$f0, ($8)			\n\t"
++                
++				"punpcklbh	$f0, $f0, $f0		\n\t"
++				"punpcklhw	$f0, $f0, $f0		\n\t"
++				"punpcklwd	$f0, $f0, $f0		\n\t"
++
++				"sdc1		$f0, -8($8)			\n\t"
++				"sdc1		$f0, -16($8)		\n\t"
++                
++				"add		$15, $8, %2			\n\t"
++				"ldc1		$f2, -8($15)		\n\t"
++                
++				"punpckhbh	$f2, $f2, $f2		\n\t"
++				"punpckhhw	$f2, $f2, $f2		\n\t"
++				"punpckhwd	$f2, $f2, $f2		\n\t"
++
++				"sdc1		$f2, ($15)			\n\t"
++				"sdc1		$f2, 8($15)			\n\t"
++
++				"add		$8, $8, %1			\n\t"
++                
++				"sub		$16, $8, %3			\n\t"
++				"bltz		$16, 1b				\n\t"
++				"nop							\n\t"
++                : "+r" (ptr)
++                : "r" ((long)wrap), "r" ((long)width), "r" (ptr + wrap*height)
++				: "$8", "$15", "$16", "$f0", "$f2"
++        );
++    }
++
++    for(i=0;i<w;i+=4) {
++        
++        ptr= buf - (i + 1) * wrap - w;
++        __asm__ volatile(
++//				".set mips3						\n\t"
++				"move		$8, %0				\n\t"
++
++                "1:                             \n\t"
++                
++				"add		$9, $8, %1			\n\t"
++				"ldc1		$f0, ($9)			\n\t"
++
++				"add		$10, $8, %2			\n\t"
++				"add		$11, $10, %2		\n\t"
++				"add		$12, $8, %3			\n\t"
++                
++				"sdc1		$f0, ($8)			\n\t"
++				"sdc1		$f0, ($10)			\n\t"
++				"sdc1		$f0, ($11)			\n\t"
++				"sdc1		$f0, ($12)			\n\t"
++
++				"addiu		$8, $8, 8			\n\t"
++                
++				"sub		$13, $8, %4			\n\t"
++                
++				"bltz		$13, 1b				\n\t"
++				"nop							\n\t"
++
++                : "+r" (ptr)
++                : "r" (((long)buf - (long)ptr - w)), "r" ((long)-wrap), "r" ((long)-wrap*3), "r" (*(ptr+width+2*w))
++				: "$8", "$9", "$10", "$11", "$12", "$13", "$f0"
++		);
++
++        ptr= last_line + (i + 1) * wrap - w;
++
++        __asm__ volatile(
++//				".set mips3						\n\t"
++
++				"move		$9, %0				\n\t"
++
++                "1:                             \n\t"
++                
++				"add		$10, $9, %1			\n\t"
++				"ldc1		$f0, ($10)				\n\t"
++
++				"add		$11, $9, %2			\n\t"
++				"add		$12, $11, %2		\n\t"
++				"add		$13, $9, %3			\n\t"
++				
++				"sdc1		$f0, ($9)			\n\t"
++				"sdc1		$f0, ($11)			\n\t"
++				"sdc1		$f0, ($12)			\n\t"
++				"sdc1		$f0, ($13)			\n\t"
++                
++				"addiu		$9, $9, 8			\n\t"
++                
++				"sub		$14, $9, %4			\n\t"
++                
++				"bltz		$14, 1b				\n\t"
++				"nop							\n\t"
++                : "+r" (ptr)
++                : "r" ((long)last_line - (long)ptr - w), "r" ((long)wrap), "r" ((long)wrap*3), "r" (ptr+width+2*w)
++				: "$9", "$10", "$11", "$12", "$13", "$14", "$f0"
++
++		);
++    }
++}
++
++void MPV_common_init_loongson2(MpegEncContext *s)
++{
++	s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_loongson2;
++	s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_loongson2;
++
++//	draw_edges = draw_edges_loongson2;
++
++}
+diff -Nru ffmpeg.orig/libavcodec/mips/Makefile ffmpeg/libavcodec/mips/Makefile
+--- ffmpeg.orig/libavcodec/mips/Makefile	2011-12-09 21:40:31.700782047 +0100
++++ ffmpeg/libavcodec/mips/Makefile	2011-12-09 21:40:50.836821045 +0100
+@@ -1,3 +1,9 @@
+ OBJS-$(HAVE_MMI)                       += ps2/dsputil_mmi.o             \
+                                           ps2/idct_mmi.o                \
+                                           ps2/mpegvideo_mmi.o           \
++
++OBJS-$(HAVE_LOONGSON2MMI)              += loongson2/idct_loongson2.o   \
++                                          loongson2/dsputil_loongson2.o \
++                                          loongson2/idct_loongson2_xvid.o \
++                                          loongson2/mpegvideo_loongson2.o \
++                                          loongson2/motion_est_loongson2.o
+diff -Nru ffmpeg.orig/libavcodec/mpegvideo.c ffmpeg/libavcodec/mpegvideo.c
+--- ffmpeg.orig/libavcodec/mpegvideo.c	2011-12-09 21:40:31.644781931 +0100
++++ ffmpeg/libavcodec/mpegvideo.c	2011-12-09 21:40:50.868821109 +0100
+@@ -182,6 +182,9 @@
+ #elif ARCH_BFIN
+     MPV_common_init_bfin(s);
+ #endif
++#ifdef HAVE_LOONGSON2MMI
++    MPV_common_init_loongson2(s);
++#endif
+ 
+     /* load & permutate scantables
+        note: only wmv uses different ones
+diff -Nru ffmpeg.orig/libavcodec/mpegvideo.h ffmpeg/libavcodec/mpegvideo.h
+--- ffmpeg.orig/libavcodec/mpegvideo.h	2011-12-09 21:40:31.728782103 +0100
++++ ffmpeg/libavcodec/mpegvideo.h	2011-12-09 21:40:50.892821159 +0100
+@@ -704,6 +704,7 @@
+ void MPV_common_init_mmx(MpegEncContext *s);
+ void MPV_common_init_axp(MpegEncContext *s);
+ void MPV_common_init_mlib(MpegEncContext *s);
++void MPV_common_init_loongson2(MpegEncContext *s);
+ void MPV_common_init_mmi(MpegEncContext *s);
+ void MPV_common_init_arm(MpegEncContext *s);
+ void MPV_common_init_altivec(MpegEncContext *s);
+diff -Nru ffmpeg.orig/libavcodec/options.c ffmpeg/libavcodec/options.c
+--- ffmpeg.orig/libavcodec/options.c	2011-12-09 21:40:31.820782292 +0100
++++ ffmpeg/libavcodec/options.c	2011-12-09 21:45:31.645390878 +0100
+@@ -251,6 +251,8 @@
+ {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
++{"libmpeg2loongson2", NULL, 0, AV_OPT_TYPE_CONST, FF_IDCT_LIBMPEG2LOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"},
++{"xvidloongson2", NULL, 0, AV_OPT_TYPE_CONST, FF_IDCT_XVIDLOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"ps2", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"mlib", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_MLIB }, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"},
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 3fed7aae2..568d9f583 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
 source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD
index 65087f373..4a0262131 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fftw
 pkgver=3.3
 pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.fftw.org/"
 depends=('glibc' 'bash')
@@ -25,26 +25,36 @@ sha1sums=('e44493ba4babeacba184568e727876d9aed44205')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  if [ "$CARCH" = "mips64el" ] ; then
+      sse2=""
+      sse=""
+      aligndouble=""
+  else
+      sse2="--enable-sse2"
+      sse="--enable-sse"
+      aligndouble="-malign-double"
+  fi
+
   # use upstream default CFLAGS while keeping our -march/-mtune
-  CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math"
+  CFLAGS+=" -O3 -fomit-frame-pointer $aligndouble -fstrict-aliasing -ffast-math"
 
   CONFIGURE="./configure F77=gfortran --prefix=/usr \
                  --enable-shared --enable-threads"
 
-  # build & install double precision
-  $CONFIGURE --enable-sse2
+  msg "Build & install double precision"
+  $CONFIGURE $sse2
   make
   make DESTDIR=${pkgdir} install
-  make clean 
+  make clean
 
-  # build & install long double precission
+  msg "build & install long double precission"
   $CONFIGURE --enable-long-double
   make
   make DESTDIR=${pkgdir} install
   make clean
 
-  # build & install single precision
-  $CONFIGURE --enable-float --enable-sse
+  msg "build & install single precision"
+  $CONFIGURE --enable-float $sse
   make
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index 56a7cedd2..85653bc9f 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -5,11 +5,13 @@ pkgbase=flac
 pkgname=('flac' 'flac-doc')
 pkgver=1.2.1
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://flac.sourceforge.net/"
 license=('BSD' 'GPL')
 depends=('libogg')
 makedepends=('nasm' 'xmms')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('nasm') # xmms doesn't build on mips
 options=('!libtool' '!makeflags')
 source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz 
 	flac-1.2.1-gcc-4.3-includes.patch)
@@ -34,6 +36,8 @@ check() {
 package_flac() {
   pkgdesc="Free Lossless Audio Codec"
   optdepends=('xmms: for using the xmms plugin')
+[ "$CARCH" = "mips64el" ] && \
+  unset optdepends
   options=('!libtool' '!docs')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 5c63fd095..a77c78bbf 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
 makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD
index b54502a19..3b9d55016 100644
--- a/extra/fluidsynth/PKGBUILD
+++ b/extra/fluidsynth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fluidsynth
 pkgver=1.1.5
 pkgrel=1
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://www.fluidsynth.org/"
 depends=('glib2' 'jack' 'dbus-core' 'libpulse')
 makedepends=('cmake' 'ladspa' 'doxygen')
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index 45db54acd..59b098efe 100644
--- a/extra/fluxbox/PKGBUILD
+++ b/extra/fluxbox/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fluxbox
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fluxbox.org"
 license=('MIT')
 depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi')
diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD
index 723543918..705b34f5d 100644
--- a/extra/fluxter/PKGBUILD
+++ b/extra/fluxter/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fluxter
 pkgver=0.1.0
 pkgrel=5
 pkgdesc="A workspace pager for fluxbox"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html"
 license=('GPL')
 depends=('gcc-libs' 'libx11')
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index ff17fe991..76bb37128 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=folks
 pkgver=0.6.6
 pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 701f308a0..73953f1f8 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=fontconfig
 pkgver=2.8.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A library for configuring and customizing font access"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.fontconfig.org/release/"
 license=('custom')
 depends=('expat>=2.0.1' 'freetype2>=2.3.11')
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 6319df46f..2e2f88a06 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fontforge
 pkgver=20111214
 pkgrel=3
 pkgdesc='Outline and bitmap font editor'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://fontforge.sourceforge.net/'
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index f5d664ee7..61c5b9320 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=foobillard++
 pkgver=3.42beta
 pkgrel=2
 pkgdesc="An OpenGL billiard game"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://foobillardplus.sourceforge.net/"
 license=('GPL2')
 depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
index 7efaa8a18..5354a6c25 100644
--- a/extra/foomatic/PKGBUILD
+++ b/extra/foomatic/PKGBUILD
@@ -3,7 +3,7 @@
  
 pkgbase="foomatic"
 pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree')
-arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
+arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
 _snapdate=20110707
 _relver=4.0.7
 pkgver=${_relver}_${_snapdate}
diff --git a/extra/fortune-mod/PKGBUILD b/extra/fortune-mod/PKGBUILD
index 9cc9b6ac7..a88f7bdb6 100644
--- a/extra/fortune-mod/PKGBUILD
+++ b/extra/fortune-mod/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fortune-mod
 pkgver=1.99.1
 pkgrel=5
 pkgdesc="The Fortune Cookie Program from BSD games"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.redellipse.net/code/fortune"
 license=('BSD')
 depends=('recode')
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 896faa265..a0255ea9b 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fping
 pkgver=3.0
 pkgrel=1
 pkgdesc="A utility to ping multiple hosts at once"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fping.org/"
 license=('custom') 
 depends=('glibc')
diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD
index ae34c1a82..01c3b1a78 100644
--- a/extra/freealut/PKGBUILD
+++ b/extra/freealut/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freealut
 pkgver=1.1.0
 pkgrel=4
 pkgdesc="OpenAL Utility Toolkit (ALUT)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openal.org"
 license=("LGPL")
 depends=('openal')
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 6f7e6b1f1..d284831b3 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freeciv
 pkgver=2.3.1
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeciv.org/"
 license=('GPL')
 depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD
index afd3f36bf..278a0ca3a 100644
--- a/extra/freeglut/PKGBUILD
+++ b/extra/freeglut/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freeglut
 pkgver=2.8.0
 pkgrel=1
 pkgdesc="Provides functionality for small OpenGL programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freeglut.sourceforge.net/"
 license=('MIT')
 depends=('libxxf86vm' 'mesa' 'libxi')
diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD
index 3fc10e827..c55c55f31 100644
--- a/extra/freenx/PKGBUILD
+++ b/extra/freenx/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freenx
 pkgver=0.7.3
 pkgrel=10
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://freenx.berlios.de"
 license=('GPL')
 depends=('nxserver' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index c91427f2c..6bddbf690 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.91
 pkgrel=2
 pkgdesc='Library for accessing Sybase and MS SQL Server databases'
 url='http://www.freetds.org'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('unixodbc')
 options=('!libtool')
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 66b741634..a9b9a792c 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freetype2
 pkgver=2.4.8
 pkgrel=1
 pkgdesc="TrueType font rendering library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://freetype.sourceforge.net"
 depends=('zlib' 'bzip2' 'sh')
diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD
index 55cebf720..e1c1d636b 100644
--- a/extra/fribidi/PKGBUILD
+++ b/extra/fribidi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fribidi
 pkgver=0.19.2
 pkgrel=2
 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://fribidi.org"
 depends=('glibc')
diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD
index fb21cbd21..c3ce7383a 100644
--- a/extra/frozen-bubble/PKGBUILD
+++ b/extra/frozen-bubble/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=2.2.1-beta1
 pkgver=${_pkgver/-/}
 pkgrel=3
 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.frozen-bubble.org"
 license=(GPL2)
 depends=(perl-sdl perl-ipc-system-simple perl-compress-bzip2 perl-file-which)
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index 306172fac..25317e58e 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fsarchiver
 pkgver=0.6.12
 pkgrel=1
 pkgdesc="A safe and flexible file-system backup and deployment tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fsarchiver.org/"
 license=('GPL')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
diff --git a/extra/fssos-nsvs/PKGBUILD b/extra/fssos-nsvs/PKGBUILD
index 16e8be8cc..02bae5641 100644
--- a/extra/fssos-nsvs/PKGBUILD
+++ b/extra/fssos-nsvs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fssos-nsvs
 pkgver=0.5
 pkgrel=7
 pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fssos.sourceforge.net/"
 license=('GPL')
 depends=('bash' 'mysql>=5.5')
diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD
index 09a890d9e..840803673 100644
--- a/extra/ftgl/PKGBUILD
+++ b/extra/ftgl/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=2.1.3-rc5
 pkgver=${_pkgver/-/}
 pkgrel=3
 pkgdesc="OpenGL library to use arbitrary fonts"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://ftgl.wiki.sourceforge.net/"
 license=(MIT)
 depends=(freetype2 mesa)
diff --git a/extra/ftjam/PKGBUILD b/extra/ftjam/PKGBUILD
index 42726f3cb..cc37b7383 100644
--- a/extra/ftjam/PKGBUILD
+++ b/extra/ftjam/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ftjam
 pkgver=2.5.3rc2
 pkgrel=3
 pkgdesc='FT Jam - an enhanced version of the Jam build tool'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freetype.org/jam/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index 1dfd3e069..92d96cdf0 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fuse
 pkgver=2.8.6
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fuse.sourceforge.net/"
 license="GPL2"
 depends=('glibc')
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD
index 867680ccb..d45e204f3 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fvwm
 pkgver=2.6.3
 pkgrel=1
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fvwm.org"
 license=('GPL' 'custom')
 depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD
index 63370145d..384b1b6df 100644
--- a/extra/fwbuilder/PKGBUILD
+++ b/extra/fwbuilder/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.0.0.3568
 pkgrel=2
 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
 url="http://www.fwbuilder.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxslt' 'net-snmp' 'qt')
 conflicts=('libfwbuilder')
diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index 73f2d9a2e..990b441c7 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fyre
 pkgver=1.0.1
 pkgrel=4
 pkgdesc="Rendering of the Peter de Jong map"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 url="http://fyre.navi.cx/"
 license=('GPL')
 depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index aaad6ef5a..9de513ac9 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=6
 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 makedepends=('python2')
 options=('libtool')
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index 636d7eda8..4badc4ab2 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=garcon
 pkgver=0.1.9
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.xfce.org/dev/garcon"
 license=('LGPL')
 groups=('xfce4')
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index 16f608ea1..f54416b69 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -2,19 +2,21 @@
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 pkgname=gc
-pkgver=7.1
-pkgrel=3
+pkgver=7.2alpha6
+pkgrel=1
 pkgdesc="A garbage collector for C and C++"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 license=('GPL')
 source=(http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz)
 depends=('gcc-libs')
 options=(!libtool)
-md5sums=('2ff9924c7249ef7f736ecfe6f08f3f9b')
+md5sums=('319d0b18cc4eb735c8038ece9df055e4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # Installing a single file twice fails.
+  sed -ri 's/(am__append_6 =) .*$/\1/' Makefile.in
   ./configure --prefix=/usr --enable-cplusplus
   make
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD
index 20dc1db3d..0a3431588 100644
--- a/extra/gcalctool/PKGBUILD
+++ b/extra/gcalctool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gcalctool
 pkgver=6.2.0
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'dconf')
 makedepends=('intltool' 'gnome-doc-utils')
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index d64e4b75b..ac28d51a2 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'libxtst')
 makedepends=('qt' 'gtk3' 'anthy' 'libchewing')
 optdepends=('qt: support for qt4 input method'
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index d6fb91c69..d47432967 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gconf-editor
 pkgver=3.0.0
 pkgrel=1
 pkgdesc="Graphical gconf registry editor"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gconf' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD
index 6a6c96175..ae8bb0c3f 100644
--- a/extra/gconf-perl/PKGBUILD
+++ b/extra/gconf-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gconf-perl
 pkgver=1.044
 pkgrel=6
 pkgdesc="Gnome2-GConf perl bindings for gconf"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index b44c806e1..7134cc0b2 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gconf
 pkgver=3.2.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A configuration database system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
diff --git a/extra/gconfmm/PKGBUILD b/extra/gconfmm/PKGBUILD
index d151b32d1..9e9238284 100644
--- a/extra/gconfmm/PKGBUILD
+++ b/extra/gconfmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=gconfmm
 pkgname=('gconfmm' 'gconfmm-docs')
 pkgver=2.28.2
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gtkmm>=2.20.3' 'glibmm-docs' 'gconf>=2.28.1' 'glibmm>=2.24.2')
 options=('!libtool')
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD
index 29eeed43a..101641945 100644
--- a/extra/gd/PKGBUILD
+++ b/extra/gd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gd
 pkgver=2.0.36RC1
 pkgrel=4
 pkgdesc="Library for the dynamic creation of images by programmers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libgd.org/"
 license=('custom')
 depends=('perl' 'libpng' 'fontconfig' 'libjpeg')
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 32952b819..795465954 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gdb
 pkgver=7.4
 pkgrel=1
 pkgdesc="The GNU Debugger"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gdb/"
 license=('GPL3')
 depends=('ncurses' 'expat' 'python2')
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 633a78da7..7452d0fd5 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gdk-pixbuf2
 pkgver=2.24.1
 pkgrel=1
 pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index fe83158e8..df31e3cfa 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdl
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 url="http://www.gnome.org/"
 depends=('gtk3')
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 038f85375..72a36a17e 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdm
 pkgver=3.2.1.1
 pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD
index d9511dc1b..c6e1eb377 100644
--- a/extra/gdome2/PKGBUILD
+++ b/extra/gdome2/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=gdome2
 pkgver=0.8.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Gnome DOM Engine"
 url="http://gdome2.cs.unibo.it/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libxml2' 'glib2')
 options=(!libtool)
@@ -16,10 +16,21 @@ md5sums=('bfc114e59eec50cbda8e4ece751ff022')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  if [ "$CARCH" = mips64el ]; then
+      CFLAGS="$CFLAGS -fpic"
+      CXXFLAGS="$CXXFLAGS -fpic"
+  fi
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+      --host=${CARCH} --disable-static
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD
index a6b0033a1..87cc99e47 100644
--- a/extra/gecko-sharp-2.0/PKGBUILD
+++ b/extra/gecko-sharp-2.0/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gecko-sharp-2.0
 pkgver=0.13
 pkgrel=4
 pkgdesc="C# bindings for gtkmozembed"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'MPL')
 url="http://www.mono-project.com/"
 depends=('xulrunner' 'gtk-sharp-2')
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 702ee9809..f368a16bb 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gedit
 pkgver=3.2.6
 pkgrel=1
 pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool')
diff --git a/extra/geeqie/PKGBUILD b/extra/geeqie/PKGBUILD
index ce3605cdb..1b30d10e4 100644
--- a/extra/geeqie/PKGBUILD
+++ b/extra/geeqie/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=geeqie
 pkgver=1.0
 pkgrel=6
 pkgdesc="A lightweight image browser and viewer (fork of GQview)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://geeqie.sourceforge.net/"
 license=('GPL3')
 depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 701e9d5f5..93a8cbd50 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gegl
 pkgver=0.1.8
 pkgrel=1
 pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gegl.org/"
 license=('GPL3' 'LGPL3')
 depends=('babl' 'gtk2')
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index fa26e76ad..0eb84efd5 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=genius
 pkgver=1.0.14
 pkgrel=1
 pkgdesc="Advanced calculator including a mathematical programming language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.jirka.org/genius.html"
 depends=('vte>=0.26.2' 'gtksourceview2>=2.10.5' 'mpfr>=3.0.0' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index d969c256c..279078fe1 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=geoip
 pkgver=1.4.8
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.maxmind.com/app/c"
 license=('GPL')
 depends=('zlib')
diff --git a/extra/gettext-mono/PKGBUILD b/extra/gettext-mono/PKGBUILD
index 9e89644a8..5741a1640 100644
--- a/extra/gettext-mono/PKGBUILD
+++ b/extra/gettext-mono/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gettext-mono
 pkgver=0.18.1.1
 pkgrel=1
 pkgdesc="mono assemblies for GNU internationalization library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gettext"
 license=('GPL')
 depends=('mono>=2.10.6')
diff --git a/extra/gftp/PKGBUILD b/extra/gftp/PKGBUILD
index 4d4bdd661..bfd5fbe2b 100644
--- a/extra/gftp/PKGBUILD
+++ b/extra/gftp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gftp
 pkgver=2.0.19
 pkgrel=3
 pkgdesc="A multithreaded ftp client for X Windows"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'openssl' 'readline')
 source=(http://www.gftp.org/$pkgname-$pkgver.tar.bz2)
 url="http://www.gftp.org/"
diff --git a/extra/ggv/PKGBUILD b/extra/ggv/PKGBUILD
index 76c346969..6a85287d8 100644
--- a/extra/ggv/PKGBUILD
+++ b/extra/ggv/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=ggv
 pkgver=2.12.0
 pkgrel=4
 pkgdesc="Postscript viewer"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('libgnomeui' 'ghostscript' 'desktop-file-utils')
 makedepends=('intltool' 'gnome-doc-utils' 'pkgconfig' 'gnome-common')
diff --git a/extra/ggz-client-libs/PKGBUILD b/extra/ggz-client-libs/PKGBUILD
index 5c173cc62..530fa77bd 100644
--- a/extra/ggz-client-libs/PKGBUILD
+++ b/extra/ggz-client-libs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ggz-client-libs
 pkgver=0.0.14.1
 pkgrel=2
 pkgdesc="GGZ client library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ggzgamingzone.org/"
 license=('LGPL')
 depends=('libggz>=0.0.14.1' 'expat>=2.0.1')
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 9fddba6ca..11a545a29 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=ghc
 pkgver=7.0.3
 pkgrel=2
 pkgdesc="The Glasgow Haskell Compiler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.haskell.org/ghc/"
 license=("custom")
 depends=('perl' 'gmp>=5.0' gcc)
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index b4a6c226e..dd4817556 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ghex
 pkgver=3.0.0
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/Ghex"
 depends=('gtk3' 'hicolor-icon-theme')
diff --git a/extra/giblib/PKGBUILD b/extra/giblib/PKGBUILD
index 7deebc84e..2d938de2e 100644
--- a/extra/giblib/PKGBUILD
+++ b/extra/giblib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=giblib
 pkgver=1.2.4
 pkgrel=5
 pkgdesc="A library that feh uses as a wrapper to imlib2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/giblib/"
 license=('MIT')
 depends=('imlib2' 'libxext' 'freetype2')
diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD
index 3c96df76f..2dce9385e 100644
--- a/extra/gif2png/PKGBUILD
+++ b/extra/gif2png/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gif2png
 pkgver=2.5.4
 pkgrel=2
 pkgdesc="A GIF to PNG image format converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.catb.org/~esr/gif2png/"
 license=('ZLIB')
 depends=('libpng')
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 86d445528..99b3f6fe6 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=4.1.6
 pkgrel=4
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('libx11')
 provides=("libungif=${pkgver}")
diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD
index d4bbf366d..14306db02 100644
--- a/extra/gifsicle/PKGBUILD
+++ b/extra/gifsicle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gifsicle
 pkgver=1.61
 pkgrel=1
 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lcdf.org/gifsicle/"
 license=('GPL')
 depends=('libx11')
diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD
index f09db2f20..9a5ac4635 100644
--- a/extra/gimp-dbp/PKGBUILD
+++ b/extra/gimp-dbp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-dbp
 pkgver=1.1.9
 pkgrel=2
 pkgdesc="David's batch processor for the GIMP"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://members.ozemail.com.au/~hodsond/dbp.html"
 license=('GPL')
 depends=('gimp')
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index e0b5eaca2..1492fb5a7 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gimp-devel
 pkgver=2.7.4
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
 license=('GPL3' 'LGPL3')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
diff --git a/extra/gimp-gap/PKGBUILD b/extra/gimp-gap/PKGBUILD
index cb6c612e4..41f576c52 100644
--- a/extra/gimp-gap/PKGBUILD
+++ b/extra/gimp-gap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-gap
 pkgver=2.6.0
 pkgrel=3
 pkgdesc="A Plug-In collection to edit and create animations for the Gimp"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gimp.org/downloads/"
 depends=('gimp' 'xvidcore' 'bash' 'libjpeg')
diff --git a/extra/gimp-refocus/PKGBUILD b/extra/gimp-refocus/PKGBUILD
index 5cc3b5703..ad1457deb 100644
--- a/extra/gimp-refocus/PKGBUILD
+++ b/extra/gimp-refocus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-refocus
 pkgver=0.9.0
 pkgrel=3
 pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://refocus.sourceforge.net/"
 license=('GPL2')
 depends=('gimp')
diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD
index b360605a7..ce7dfb73c 100644
--- a/extra/gimp-ufraw/PKGBUILD
+++ b/extra/gimp-ufraw/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.18
 pkgrel=3
 pkgdesc="Standalone or gimp plugin converter for raw files"
 url="http://ufraw.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
 makedepends=('gimp' 'cinepaint')
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index c083eb449..eb1b6fd3f 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gimp
 pkgver=2.6.11
 pkgrel=7
 pkgdesc="GNU Image Manipulation Program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
 license=('GPL' 'LGPL')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 474dae577..b717cd079 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=git
 pkgver=1.7.8.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://git-scm.com/"
 license=('GPL2')
 depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index b7dc6877c..c077a7970 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gjs
 pkgver=1.30.1
 pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Gjs"
 license=('GPL')
 depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
diff --git a/extra/gksu/PKGBUILD b/extra/gksu/PKGBUILD
index 37f871cae..5790bb56d 100644
--- a/extra/gksu/PKGBUILD
+++ b/extra/gksu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gksu
 pkgver=2.0.2
 pkgrel=4
 pkgdesc="A graphical frontend for su"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/gksu/index.html"
 license=('GPL')
 depends=('libgksu>=2.0.12' 'xorg-xauth')
diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD
index 96d77bced..4388acfec 100644
--- a/extra/glade-perl/PKGBUILD
+++ b/extra/glade-perl/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Gtk2-GladeXML
 pkgver=1.007
 pkgrel=4
 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 39a5f92f2..0b90d2b4c 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glade
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL' 'LGPL')
 depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject2')
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index eb08d7441..51a9e9ea3 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=glew
 pkgver=1.7.0
 pkgrel=1
 pkgdesc="The OpenGL Extension Wrangler Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://glew.sourceforge.net"
 license=('BSD' 'MIT' 'GPL')
 depends=('libxmu' 'libxi' 'mesa')
diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD
index 5c073c3b0..914d30c34 100644
--- a/extra/glhack/PKGBUILD
+++ b/extra/glhack/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glhack
 pkgver=1.2
 pkgrel=5
 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://glhack.sourceforge.net/"
 license=('custom')
 depends=('sdl' 'libpng' 'libgl')
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index 529ee0675..2e71e5455 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glib-networking
 pkgver=2.30.2
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index a0dd232fc..762697f54 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=glib-perl
 pkgver=1.241
 pkgrel=1
 pkgdesc="Perl wrappers for glib 2.x, including GObject"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index 480a521e2..1bb00ade4 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glib
 pkgver=1.2.10
 pkgrel=9
 pkgdesc="Common C routines used by Gtk+ and other libs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index dd8fce6d2..7599f84f9 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
 pkgver=2.30.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index 0ec9479fc..c7d7845c1 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=glpk
 pkgver=4.44
 pkgrel=1
 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/glpk/glpk.html"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 71b97318c..4d855ad76 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -7,7 +7,7 @@ _fmver=1.8.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://glsof.sourceforge.net/"
 license=('GPL3')
 depends=('sh' 'java-runtime' 'lsof')
diff --git a/extra/gluezilla/PKGBUILD b/extra/gluezilla/PKGBUILD
index 224068bd6..f59c0421e 100644
--- a/extra/gluezilla/PKGBUILD
+++ b/extra/gluezilla/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gluezilla
 pkgver=2.6
 pkgrel=3
 pkgdesc="Web browser implementation (Gecko) for Mono, the free .NET runtime"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL2' 'MPL')
 url="http://www.mono-project.com/"
 depends=('mono' 'xulrunner>=2.0')
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index d23208e45..34618a3ed 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmetadom
 pkgver=0.2.6
 pkgrel=3
 pkgdesc="C++ bindings for GDome2 DOM implementation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmetadom.sourceforge.net/"
 license=('LGPL')
 depends=('gdome2')
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 8ed0d8e6e..32ac50fb7 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -6,11 +6,13 @@ pkgname=gmime
 pkgver=2.6.4
 pkgrel=1
 pkgdesc="Core mime parsing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://spruce.sourceforge.net/gmime/"
 depends=('glib2' 'gpgme' 'zlib')
-makedepends=('gtk-sharp-2')
+makedepends=('gtk-sharp-2' 'pkgconfig')
+[ "$CARCH" = "mips64el" ] && \
+unset makedepend
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163')
diff --git a/extra/gmpc/PKGBUILD b/extra/gmpc/PKGBUILD
index 1cae5f2db..aab6f690a 100644
--- a/extra/gmpc/PKGBUILD
+++ b/extra/gmpc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmpc
 pkgver=11.8.16
 pkgrel=1
 pkgdesc="A GTK2 client for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpclient.org/home"
 license=('GPL')
 depends=('libunique' 'libmpd' 'libsoup' 'sqlite3' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD
index 60b952e00..74f641527 100644
--- a/extra/gnet/PKGBUILD
+++ b/extra/gnet/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnet
 pkgver=2.0.8
 pkgrel=2
 pkgdesc="A simple network library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GNetLibrary"
 license=('LGPL')
 depends=('glib2')
diff --git a/extra/gnokii/PKGBUILD b/extra/gnokii/PKGBUILD
index 036522ede..cce1c878e 100644
--- a/extra/gnokii/PKGBUILD
+++ b/extra/gnokii/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gnokii
 pkgver=0.6.30
 pkgrel=2
 pkgdesc="Tools and user space driver for use with mobile phones"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnokii.org/"
 license=('GPL')
 depends=('libusb-compat' 'libxpm' 'bluez' 'libical')
diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD
index 84698b9c1..272287501 100644
--- a/extra/gnome-alsamixer/PKGBUILD
+++ b/extra/gnome-alsamixer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-alsamixer
 pkgver=0.9.6
 pkgrel=4
 pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/gnome-alsamixer"
 license=('GPL')
 depends=('libgnomeui')
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
index bb3ad8083..87dca22fc 100644
--- a/extra/gnome-applets/PKGBUILD
+++ b/extra/gnome-applets/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-applets
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME Applets"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
 makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common')
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 514f4088c..e4c84cba3 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-bluetooth
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
 depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf')
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index c436dc1f5..907ba7315 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-color-manager
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 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')
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index df8b95706..9c5db6383 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -5,9 +5,9 @@ pkgname=gnome-control-center
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
+optdepends=('mesa-demos-libre: provides glxinfo for graphics information'
             'apg: adds password generation for user accounts'
             'gnome-color-manager: for color management tasks')
 makedepends=('gnome-doc-utils' 'intltool')
diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD
index 3a6309dc5..8342241c1 100644
--- a/extra/gnome-desktop-sharp/PKGBUILD
+++ b/extra/gnome-desktop-sharp/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gnome-desktop-sharp
 pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
 pkgrel=8
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index b9e302837..1faf9806b 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-desktop
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD
index 3829d54f7..77b1a8972 100644
--- a/extra/gnome-desktop2/PKGBUILD
+++ b/extra/gnome-desktop2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=${_pkgname}2
 pkgver=2.32.1
 pkgrel=1
 pkgdesc="The GNOME Desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL LGPL)
 depends=(gconf gtk2 startup-notification)
 makedepends=(gnome-doc-utils intltool)
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index d9de3d900..a7eb125c8 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(gnome-disk-utility libgdu)
 pkgver=3.0.2
 pkgrel=2
 pkgdesc="GNOME libraries and applications for dealing with storage devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi'
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index ddaf0d307..fb899dd13 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-games
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD
index e8d024129..39807dce4 100644
--- a/extra/gnome-keyring-sharp/PKGBUILD
+++ b/extra/gnome-keyring-sharp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gnome-keyring-sharp
 pkgver=1.0.2
 pkgrel=2
 pkgdesc="A fully managed implementation of libgnome-keyring"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mono-project.com/Libraries"
 license=('custom')
 depends=('ndesk-dbus>=0.4' 'libgnome-keyring')
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 542137746..a755d7963 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-keyring
 pkgver=3.2.2
 pkgrel=3
 pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'python2')
diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD
index 5697957f8..6d96303ff 100644
--- a/extra/gnome-media/PKGBUILD
+++ b/extra/gnome-media/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-media
 pkgver=2.91.2
 pkgrel=3
 pkgdesc="GNOME Media Tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 9589872bb..a136ea22c 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-menus
 pkgver=3.2.0.1
 pkgrel=1
 pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2' 'python2')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index ca155f1ef..1815fd850 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-nettool
 pkgver=3.0.1
 pkgrel=1
 pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('gtk3' 'libgtop' 'dnsutils' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme')
 makedepends=('gnome-doc-utils' 'intltool')
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index 61e38e405..d627522a0 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=gnome-panel
 pkgver=3.2.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="The GNOME Panel"
 url="http://www.gnome.org"
diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD
index 81f68ee25..cf5d1a776 100644
--- a/extra/gnome-perl/PKGBUILD
+++ b/extra/gnome-perl/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Gnome2
 pkgver=1.042
 pkgrel=6
 pkgdesc="Perl bindings for libgnome"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD
index 4bce16951..6304baeba 100644
--- a/extra/gnome-phone-manager/PKGBUILD
+++ b/extra/gnome-phone-manager/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-phone-manager
 pkgver=0.68
 pkgrel=1
 pkgdesc="Control your mobile phone from your GNOME desktop."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/PhoneManager"
 license=('GPL')
 depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD
index 9a780339e..bd98ec59c 100644
--- a/extra/gnome-pilot/PKGBUILD
+++ b/extra/gnome-pilot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-pilot
 pkgver=2.91.93
 pkgrel=1
 pkgdesc="Pilot Support for Gnome"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('pilot-link' 'evolution-data-server')
 makedepends=('intltool' 'gob2' 'gnome-doc-utils' 'gnome-panel')
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index e69a65c27..0d91ed969 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-power-manager
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Power management tools."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnome.org/projects/gnome-power-manager/"
 license=('GPL')
 depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index fac631109..9aac85d4d 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=gnome-python-desktop
 pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck')
 pkgver=2.32.0
 pkgrel=9
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 options=('!libtool')
 makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg')
diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD
index 18d6b3de3..19dbcdbb6 100644
--- a/extra/gnome-python-extras/PKGBUILD
+++ b/extra/gnome-python-extras/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gnome-python-extras
 pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
 pkgver=2.25.3
 pkgrel=11
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.daa.com.au/~james/pygtk/"
 license=('GPL' 'LGPL')
 makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python')
diff --git a/extra/gnome-python/PKGBUILD b/extra/gnome-python/PKGBUILD
index b7a0e897f..26966b96d 100644
--- a/extra/gnome-python/PKGBUILD
+++ b/extra/gnome-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=gnome-python
 pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
 pkgver=2.28.1
 pkgrel=7
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 makedepends=('pygtk' 'pyorbit' 'libgnomeui')
 options=('!libtool')
diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD
index 872a3eb51..1672f4955 100644
--- a/extra/gnome-screensaver/PKGBUILD
+++ b/extra/gnome-screensaver/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-screensaver
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 671597662..1e098f700 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-session
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf')
 makedepends=('intltool' 'mesa' 'xtrans')
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index c34dc67ff..93768bae2 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-settings-daemon
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
 makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD
index 276b77a73..c530818c4 100644
--- a/extra/gnome-sharp/PKGBUILD
+++ b/extra/gnome-sharp/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gnome-sharp
 pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
 pkgver=2.24.2
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index dd0ecc6be..e751947bd 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-shell
 pkgver=3.2.2.1
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeShell"
 license=('GPL2')
 depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 'nautilus' 'telepathy-mission-control' 'unzip')
diff --git a/extra/gnome-speech/PKGBUILD b/extra/gnome-speech/PKGBUILD
index 686de821f..ce1124fef 100644
--- a/extra/gnome-speech/PKGBUILD
+++ b/extra/gnome-speech/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-speech
 pkgver=0.4.25
 pkgrel=2
 pkgdesc="Gnome Text-to-Speech"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://www.gnome.org"
 depends=('libbonobo')
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 5ebfe3b3c..7f26b0a44 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-system-monitor
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme')
 makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 484db511a..c4ee90d1c 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-terminal
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
 makedepends=('gnome-doc-utils' 'intltool' 'gtk2')
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 1a34c44db..a6d46c6ab 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-themes-standard
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://abattis.org/cantarell/"
 license=('GPL2')
 depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg')
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 92baa37ad..f860a5fad 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-user-share
 pkgver=3.0.1
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
 depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3')
diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD
index 5017a7712..50c0ecbb1 100644
--- a/extra/gnome-utils/PKGBUILD
+++ b/extra/gnome-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-utils
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
 makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD
index 3960f5285..885b50ad2 100644
--- a/extra/gnome-vfs-perl/PKGBUILD
+++ b/extra/gnome-vfs-perl/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Gnome2-VFS
 pkgver=1.081
 pkgrel=4
 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index dae1cfeb1..5d67ca6f1 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-vfs
 pkgver=2.24.4
 pkgrel=6
 pkgdesc="The GNOME Virtual File System"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
diff --git a/extra/gnome-vfsmm/PKGBUILD b/extra/gnome-vfsmm/PKGBUILD
index c79065313..1816b9be4 100644
--- a/extra/gnome-vfsmm/PKGBUILD
+++ b/extra/gnome-vfsmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-vfsmm
 pkgver=2.26.0
 pkgrel=2
 pkgdesc="A C++ wrapper for gnome-vfs."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gnome-vfs' 'glibmm')
 makedepends=('pkgconfig' 'doxygen')
diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD
index 2563caae4..88516d278 100644
--- a/extra/gnomecanvas-perl/PKGBUILD
+++ b/extra/gnomecanvas-perl/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Gnome2-Canvas
 pkgver=1.002
 pkgrel=8
 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/gnu-netcat/PKGBUILD b/extra/gnu-netcat/PKGBUILD
index a436a9d72..c4f500162 100644
--- a/extra/gnu-netcat/PKGBUILD
+++ b/extra/gnu-netcat/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.7.1
 pkgrel=4
 pkgdesc="GNU rewrite of netcat, the network piping application"
 depends=('glibc' 'texinfo')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://netcat.sourceforge.net/"
 license=('GPL')
 replaces=('netcat')
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 78a5325cb..27c8bf8f4 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnucash
 pkgver=2.4.9
 pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnucash.org"
 license=("GPL")
 depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD
index cf9545094..d98c53d73 100644
--- a/extra/gnuchess/PKGBUILD
+++ b/extra/gnuchess/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=6.0.1
 pkgrel=1
 pkgdesc="Lets most modern computers play a full game of chess"
 url="http://www.gnu.org/software/chess/chess.html"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'ncurses' 'readline')
 source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD
index 8d0c654ea..b90240431 100644
--- a/extra/gnugo/PKGBUILD
+++ b/extra/gnugo/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gnugo
 pkgver=3.8
 pkgrel=2
 pkgdesc="A program that plays the game of Go"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gnugo/"
 license=('GPL3' 'custom')
 depends=('ncurses' 'glibc' 'texinfo')
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 51531a917..e13e70e06 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnumeric
 pkgver=1.10.17
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/gnupg/PKGBUILD b/extra/gnupg/PKGBUILD
index 997075abb..43bb5d030 100644
--- a/extra/gnupg/PKGBUILD
+++ b/extra/gnupg/PKGBUILD
@@ -5,16 +5,19 @@ pkgname=gnupg
 pkgver=1.4.11
 pkgrel=3
 pkgdesc="GNU Privacy Guard - a PGP replacement tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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)
+source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2
+        gnupg_1.4.11_mips_gcc4.4.patch)
 install=gnupg.install
 url="http://www.gnupg.org/"
-md5sums=('411744e1ef8ce90b87938c4203f001f1')
+md5sums=('411744e1ef8ce90b87938c4203f001f1'
+         '2d919d48c847e9856dabdbb66328f09a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/gnupg_1.4.11_mips_gcc4.4.patch
   ./configure --prefix=/usr \
 	--libexecdir=/usr/lib \
 	--enable-noexecstack
diff --git a/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch b/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
new file mode 100644
index 000000000..5fcbdc628
--- /dev/null
+++ b/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
@@ -0,0 +1,47 @@
+## mips_gcc4.4 by Werner Koch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build fails on mips(el) due to changes the removal 
+## DP: of the 'h' constraint for MIPS in gcc-4.4.x versions.
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-devel/2010-October/025805.html>
+
+diff -Nur gnupg-1.4.11.orig/mpi/longlong.h gnupg-1.4.11/mpi/longlong.h
+--- gnupg-1.4.11.orig/mpi/longlong.h	2010-06-01 13:01:46.000000000 +0200
++++ gnupg-1.4.11/mpi/longlong.h	2010-10-28 22:01:19.000000000 +0200
+@@ -710,12 +710,13 @@
+  **************  MIPS  *****************
+  ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
+-#define umul_ppmm(w1, w0, u, v)                                         \
++#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++#define umul_ppmm(w1, w0, u, v) \
+   do {                                                                  \
+-    UDItype __ll = (UDItype)(u) * (v);                                  \
+-    w1 = __ll >> 32;                                                    \
+-    w0 = __ll;                                                          \
++    UDItype _r;                                                         \
++    _r = (UDItype) u * v;                                               \
++    (w1) = _r >> 32;                                                    \
++    (w0) = (USItype) _r;                                                \
+   } while (0)
+ #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v)                                         \
+@@ -742,7 +743,16 @@
+  **************  MIPS/64  **************
+  ***************************************/
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++   typedef unsigned int UTItype __attribute__ ((mode (TI)));
++ #  define umul_ppmm(w1, w0, u, v)                                       \
++  do {                                                                  \
++    UTItype _r;                                                         \
++    _r = (UTItype) u * v;                                               \
++    (w1) = _r >> 64;                                                    \
++    (w0) = (UDItype) _r;                                                \
++  } while (0)
++# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3"                                               \
+ 	   : "=l" ((UDItype)(w0)),                                      \
diff --git a/extra/gnupg2/PKGBUILD b/extra/gnupg2/PKGBUILD
index f237df630..4ecc4aee3 100644
--- a/extra/gnupg2/PKGBUILD
+++ b/extra/gnupg2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnupg2
 pkgver=2.0.18
 pkgrel=1
 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt'
 	'pth' 'libusb-compat' 'libassuan' 'texinfo' 'readline' 'pinentry' 'dirmngr')
 license=('GPL')
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 1207d38a3..9f5b437c4 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnuplot
 pkgver=4.4.3
 pkgrel=1
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.gnuplot.info" 
 license=('custom') 
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index b06ef1e30..1229e9833 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -5,13 +5,13 @@ pkgname=gnutls
 pkgver=3.0.12
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman' '!makeflags')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
-makedepends=('valgrind')
+[ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
 md5sums=('685fe5c00786c04b39e9aac362fa0cac')
 
diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD
index 061325a4b..c9c90548b 100644
--- a/extra/gob2/PKGBUILD
+++ b/extra/gob2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gob2
 pkgver=2.0.18
 pkgrel=1
 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('glib2')
 url="http://www.5z.com/jirka/gob.html"
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 7128afb90..5e1fee3fd 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=gobject-introspection
 pkgver=1.30.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Introspection system for GObject-based libraries"
 url="http://live.gnome.org/GObjectInstrospection"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL' 'GPL')
 depends=('glib2' 'python2')
 makedepends=('cairo')
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index a7a8f4fe9..07866eafe 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=goffice
 pkgver=0.8.17
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL')
 options=('!libtool')
diff --git a/extra/gpart/PKGBUILD b/extra/gpart/PKGBUILD
index 65c5e9fa5..b6760e42f 100644
--- a/extra/gpart/PKGBUILD
+++ b/extra/gpart/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpart
 pkgver=0.1h
 pkgrel=5
 pkgdesc="Partition table rescue/guessing tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.stud.uni-hannover.de/user/76201/gpart/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 9a499549b..a4d55309d 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gparted
 pkgver=0.11.0
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
 license=('GPL')
 depends=('parted' 'gtkmm' 'libsigc++')
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index 7c3ec52bc..b16444458 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Perfect hash function generator"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.gnu.org/software/gperf/"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
diff --git a/extra/gpgme/PKGBUILD b/extra/gpgme/PKGBUILD
index 3593bb5e7..4b3767af5 100644
--- a/extra/gpgme/PKGBUILD
+++ b/extra/gpgme/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpgme
 pkgver=1.3.1
 pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnupg.org/related_software/gpgme/"
 license=('GPL')
 depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2')
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index c4eb78927..08b389fa0 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gphoto2
 pkgver=2.4.11
 pkgrel=1
 pkgdesc="A digital camera download and access program."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
 depends=('libgphoto2>=2.4.11' 'popt' 'aalib' 'readline')
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 1c9ae1425..6a15d34cf 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gpsd
 pkgver=3.3
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://catb.org/gpsd/"
 license=('BSD')
 depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 12bc4baa8..c9aebc698 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gptfdisk
 pkgver=0.8.2
 pkgrel=1
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rodsbooks.com/gdisk/"
 license=('GPL2')
 depends=('gcc-libs' 'util-linux' 'popt' 'icu')
diff --git a/extra/gqview/PKGBUILD b/extra/gqview/PKGBUILD
index de023d067..d79f3ac79 100644
--- a/extra/gqview/PKGBUILD
+++ b/extra/gqview/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gqview
 pkgver=2.0.4
 pkgrel=4
 pkgdesc="An image browser and viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gqview.sourceforge.net/"
 license=('GPL')
 depends=('gtk2' 'desktop-file-utils')
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index 5acc48479..c71f63ce3 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=grantlee
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gitorious.org/grantlee/pages/Home"
 license=('LGPL3')
 depends=('qt')
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 47e8fee3c..d7f4c1e94 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.3.13
 pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('perl')
 depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 21b6ae5eb..fab274a09 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=graphite
 pkgver=1.0.3
 pkgrel=1
 epoch=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://graphite.sil.org/"
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
 license=('custom_SIL Dual license')
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 90865ddae..2403354bf 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=6
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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'
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index 34c099ffb..b1b19646b 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.1.18
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 license=('LGPL')
 depends=('gtk3' 'libxml2' 'libsoup')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
diff --git a/extra/grip/PKGBUILD b/extra/grip/PKGBUILD
index 904ab4eda..d12cfc08c 100644
--- a/extra/grip/PKGBUILD
+++ b/extra/grip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=grip
 pkgver=3.3.1
 pkgrel=9
 pkgdesc="A cd-player and ripper for the Gnome desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://nostatic.org/grip/"
 depends=('vte' 'curl' 'libgnomeui' 'id3lib' 'cdparanoia')
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index eda29fb4c..228d50dd8 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -11,7 +11,7 @@ url="http://www.gnu.org/software/gsl/gsl.html"
 source=(http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz)
 install=gsl.install
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'bash')
 options=('!libtool')
 sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e')
diff --git a/extra/gsm/PKGBUILD b/extra/gsm/PKGBUILD
index 647cd2778..b95d4f4e5 100644
--- a/extra/gsm/PKGBUILD
+++ b/extra/gsm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gsm
 pkgver=1.0.13
 pkgrel=6
 pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.quut.com/gsm/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index aa78f6b01..2ea27fe5a 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gssdp
 pkgver=0.12.0
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://gupnp.org/"
 license=('LGPL')
 depends=('libsoup')
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index ad59c539c..d88467e7b 100644
--- a/extra/gstreamer0.10-base/PKGBUILD
+++ b/extra/gstreamer0.10-base/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=('gstreamer0.10-base')
 pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
 pkgver=0.10.35
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
 options=(!libtool !emptydirs)
diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD
index 0e4dade8f..f9fe836bc 100644
--- a/extra/gstreamer0.10-ffmpeg/PKGBUILD
+++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamer0.10-ffmpeg
 pkgver=0.10.13
 pkgrel=1
 pkgdesc="Gstreamer FFMpeg Plugin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gstreamer0.10-base' 'bzip2')
 makedepends=('pkgconfig' 'yasm' 'sdl')
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index cacb2e3b0..c24fdca2f 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.30
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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/"
@@ -22,8 +22,8 @@ build() {
     --disable-schemas-install \
     --disable-hal \
     --disable-esd \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
+    --with-package-name="GStreamer Good Plugins (Parabola)" \
+    --with-package-origin="https://parabolagnulinux.org/"
 
   make
   sed -e 's/gst sys ext/gst/' -i Makefile
diff --git a/extra/gstreamer0.10-python/PKGBUILD b/extra/gstreamer0.10-python/PKGBUILD
index 2af9448a8..efb71163c 100644
--- a/extra/gstreamer0.10-python/PKGBUILD
+++ b/extra/gstreamer0.10-python/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamer0.10-python
 pkgver=0.10.22
 pkgrel=1
 pkgdesc="Python bindings for GStreamer 0.10"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.32')
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 9ec05bb6d..080217834 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.18
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 url="http://gstreamer.freedesktop.org/"
diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index bde26b026..e7498d2be 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamer0.10
 pkgver=0.10.35
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('libxml2' 'glib2')
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 04888a61b..49ff79d86 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gthumb
 pkgver=2.14.1
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://gthumb.sourceforge.net/"
 depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2')
diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD
index d614c9def..d9b0c8f79 100644
--- a/extra/gtk-engines/PKGBUILD
+++ b/extra/gtk-engines/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk-engines
 pkgver=2.20.2
 pkgrel=1
 pkgdesc="Theme engines for GTK+ 2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('gtk2>=2.22.0')
 makedepends=('pkgconfig' 'intltool')
diff --git a/extra/gtk-qt-engine/PKGBUILD b/extra/gtk-qt-engine/PKGBUILD
index 247195fa4..7d7f5629a 100644
--- a/extra/gtk-qt-engine/PKGBUILD
+++ b/extra/gtk-qt-engine/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk-qt-engine
 pkgver=1.1
 pkgrel=3
 pkgdesc="A GTK engine which makes your GTK2 Apps match your QT theme"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://code.google.com/p/gtk-qt-engine/"
 depends=('libbonoboui' 'kdelibs')
diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD
index 7adbebf17..559d96c43 100644
--- a/extra/gtk-sharp-2/PKGBUILD
+++ b/extra/gtk-sharp-2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk-sharp-2
 pkgver=2.12.11
 pkgrel=1
 pkgdesc="gtk2 bindings for C#"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk-sharp.sourceforge.net"
 depends=('mono' 'libglade' 'gtk2')
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index a793618de..a962a152b 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gtk-vnc
 pkgver=0.4.4
 pkgrel=1
 pkgdesc="A VNC viewer widget for GTK"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/gtk-vnc"
 license=('LGPL')
 depends=('libgcrypt' 'gtk3')
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 7c7212ff5..f6277c090 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=gtk-xfce-engine
 pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
 pkgver=2.99.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
index 30fc520a8..a2310f25f 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk
 pkgver=1.2.10
 pkgrel=11
 pkgdesc="The GTK+ toolkit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('libxi' 'glib' 'sh')
diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD
index 84a7b8efe..c76060d9b 100644
--- a/extra/gtk2-perl/PKGBUILD
+++ b/extra/gtk2-perl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk2-perl
 pkgver=1.241
 pkgrel=1
 pkgdesc="Perl bindings for GTK+ 2.x"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 40d39206d..62edc97f7 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.9
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
              'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index a372d0675..3179a6133 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk3
 pkgver=3.2.3
 pkgrel=2
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 install=gtk3.install
 depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD
index 50170f6a3..25b17a369 100644
--- a/extra/gtkglext/PKGBUILD
+++ b/extra/gtkglext/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkglext
 pkgver=1.2.0
 pkgrel=6
 pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
 depends=('gtk2' 'mesa' 'libxmu')
diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD
index f29c74bc5..41cbad1ed 100644
--- a/extra/gtkglextmm/PKGBUILD
+++ b/extra/gtkglextmm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkglextmm
 pkgver=1.2.0
 pkgrel=8
 pkgdesc="Cpp C++ bindings for gtkglext"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
 depends=('gtkmm' 'gtkglext')
 makedepends=('pkgconfig')
diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD
index c92e9fcaf..9f55b0792 100644
--- a/extra/gtkhtml/PKGBUILD
+++ b/extra/gtkhtml/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtkhtml
 pkgver=3.32.2
 pkgrel=2
 pkgdesc="A lightweight HTML renderer/editor widget for GTK2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup')
 makedepends=('intltool')
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 09cd85827..216b2a128 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=gtkhtml
 pkgver=4.2.3
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
 makedepends=('intltool')
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index fb9e39f62..c1a8a58f6 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkimageview
 pkgver=1.6.4
 pkgrel=3
 pkgdesc="Simple image viewer widget for GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.bjourne.webfactional.com/"
 license=('LGPL2.1')
 depends=('gtk2')
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index 4cad6bb07..dc75031e1 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkmathview
 pkgver=0.8.0
 pkgrel=3
 pkgdesc="C++ rendering engine for MathML documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://helm.cs.unibo.it/mml-widget/"
 license=('GPL')
 depends=('popt' 'gtk2' 't1lib' 'gmetadom')
diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index 35801c5cc..00f5ccec6 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
 pkgver=2.24.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 943c518e0..ae812c133 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
 pkgver=3.2.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index 2ce59e323..f56c3498e 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkpod
 pkgver=2.1.0
 pkgrel=1
 pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkpod.sourceforge.net"
 license=('GPL')
 depends=('anjuta' 'curl' 'dconf' 'flac' 'libid3tag' 'libgpod>=0.8.0')
diff --git a/extra/gtksourceview2/PKGBUILD b/extra/gtksourceview2/PKGBUILD
index 21473004f..08f887870 100644
--- a/extra/gtksourceview2/PKGBUILD
+++ b/extra/gtksourceview2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtksourceview2
 pkgver=2.10.5
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk2>=2.22.0' 'libxml2>=2.7.7')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 794aab706..a26d5b923 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=gtksourceview
 pkgver=3.2.3
 pkgrel=2
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'libxml2')
 makedepends=('intltool' 'gobject-introspection' 'glade')
diff --git a/extra/gtkspell/PKGBUILD b/extra/gtkspell/PKGBUILD
index 162584730..272c319ed 100644
--- a/extra/gtkspell/PKGBUILD
+++ b/extra/gtkspell/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.16
 pkgrel=1
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk2>=2.18.3' 'enchant>=1.5.0')
 makedepends=('intltool' 'gtk-doc')
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 900ac4e94..51ab892ac 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gucharmap
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 depends=('gconf' 'hicolor-icon-theme')
diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD
index eafece87a..54e90fd83 100644
--- a/extra/guile/PKGBUILD
+++ b/extra/guile/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.8.8
 pkgrel=1
 pkgdesc="a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gmp' 'libtool' 'ncurses>=5.7' 'texinfo')
 install=guile.install
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index fa41c86b2..37327b798 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gutenprint
 pkgver=5.2.7
 pkgrel=3
 pkgdesc="Top quality printer drivers for POSIX systems"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 install=gutenprint.install
 depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it
diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD
index 028bacf99..8ce7b917d 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gv
 pkgver=3.7.2
 pkgrel=1
 pkgdesc="A program to view PostScript and PDF documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gv/"
 license=('GPL')
 depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index ab8552cec..26bb44088 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
 pkgver=1.10.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
 url="http://www.gnome.org"
diff --git a/extra/gweled/PKGBUILD b/extra/gweled/PKGBUILD
index df62dc0a4..ce87fb21e 100644
--- a/extra/gweled/PKGBUILD
+++ b/extra/gweled/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gweled
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="A puzzle game similar to Bejeweled (aka Diamond Mine)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://launchpad.net/gweled/"
 depends=('gtk2' 'librsvg' 'libmikmod' 'hicolor-icon-theme')
diff --git a/extra/habak/PKGBUILD b/extra/habak/PKGBUILD
index 69899b64e..88bcf528a 100644
--- a/extra/habak/PKGBUILD
+++ b/extra/habak/PKGBUILD
@@ -10,7 +10,7 @@ url="http://fvwm-crystal.org"
 license=('GPL2')
 depends=('imlib2')
 source=("http://download.gna.org/fvwm-crystal/habak/$pkgver/$pkgname-$pkgver.tar.gz")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
 md5sums=('bee5c394989367f7a4c5cb9ec99d307c')
 
diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD
index ac93ba2bf..f9cb98065 100644
--- a/extra/happy/PKGBUILD
+++ b/extra/happy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.18.6
 pkgrel=1
 pkgdesc="The Parser Generator for Haskell"
 url="http://www.haskell.org/happy/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("custom:BSD3")
 depends=(gmp)
 makedepends=(ghc=7.0.2 haskell-mtl=2.0.1.0)
diff --git a/extra/haskell-cgi/PKGBUILD b/extra/haskell-cgi/PKGBUILD
index 4b64ba578..1ebe591af 100644
--- a/extra/haskell-cgi/PKGBUILD
+++ b/extra/haskell-cgi/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3.1
 pkgdesc="A library for writing CGI programs"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-deepseq/PKGBUILD b/extra/haskell-deepseq/PKGBUILD
index 934303f2b..92818f74c 100644
--- a/extra/haskell-deepseq/PKGBUILD
+++ b/extra/haskell-deepseq/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2.1
 pkgdesc="Fully evaluate data structures"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-fgl/PKGBUILD b/extra/haskell-fgl/PKGBUILD
index 45f466e91..a397c16a1 100644
--- a/extra/haskell-fgl/PKGBUILD
+++ b/extra/haskell-fgl/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=4.1
 pkgdesc="Martin Erwig's Functional Graph Library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=()
 depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
diff --git a/extra/haskell-glut/PKGBUILD b/extra/haskell-glut/PKGBUILD
index 98a30495c..c47b76613 100644
--- a/extra/haskell-glut/PKGBUILD
+++ b/extra/haskell-glut/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=7.1
 pkgdesc="A binding for the OpenGL Utility Toolkit"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=()
 depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut')
 options=('strip')
diff --git a/extra/haskell-haskell-src/PKGBUILD b/extra/haskell-haskell-src/PKGBUILD
index eeb4844a7..dfc85c3a6 100644
--- a/extra/haskell-haskell-src/PKGBUILD
+++ b/extra/haskell-haskell-src/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2.1
 pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh)
 makedepends=(happy)
 options=('strip')
diff --git a/extra/haskell-html/PKGBUILD b/extra/haskell-html/PKGBUILD
index 1d207117e..203bc1589 100644
--- a/extra/haskell-html/PKGBUILD
+++ b/extra/haskell-html/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=9.1
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index d1106c478..f0f33d5cb 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3.1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-hunit/PKGBUILD b/extra/haskell-hunit/PKGBUILD
index 401887e4e..c2009a927 100644
--- a/extra/haskell-hunit/PKGBUILD
+++ b/extra/haskell-hunit/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2.1
 pkgdesc="A unit testing framework for Haskell"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index e0ee184de..932f9360c 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=3.1
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 372cdf623..2d1b78c75 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2.1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-opengl/PKGBUILD b/extra/haskell-opengl/PKGBUILD
index 8d70bbc91..909a68239 100644
--- a/extra/haskell-opengl/PKGBUILD
+++ b/extra/haskell-opengl/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=7.1
 pkgdesc="A binding for the OpenGL graphics system"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' 'mesa')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-parallel/PKGBUILD b/extra/haskell-parallel/PKGBUILD
index 0e46c2c93..7b13af989 100644
--- a/extra/haskell-parallel/PKGBUILD
+++ b/extra/haskell-parallel/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3.1
 pkgdesc="Parallel programming library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 0810df75b..fe0fca0ab 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2.1
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-platform/PKGBUILD b/extra/haskell-platform/PKGBUILD
index 2534d95c2..02dbe7c29 100644
--- a/extra/haskell-platform/PKGBUILD
+++ b/extra/haskell-platform/PKGBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="The Haskell Platform"
 url="http://hackage.haskell.org/platform/"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' 
          'haskell-glut=2.1.2.1-7.1' 
          'haskell-http=4000.1.1-3.1'
diff --git a/extra/haskell-quickcheck/PKGBUILD b/extra/haskell-quickcheck/PKGBUILD
index ab05c75f7..0a338c9b5 100644
--- a/extra/haskell-quickcheck/PKGBUILD
+++ b/extra/haskell-quickcheck/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3.1
 pkgdesc="Automatic testing of Haskell programs"
 url="http://hackage.haskell.org/package/QuickCheck"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-regex-base/PKGBUILD b/extra/haskell-regex-base/PKGBUILD
index 57721d39b..dc920b63a 100644
--- a/extra/haskell-regex-base/PKGBUILD
+++ b/extra/haskell-regex-base/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=4.1
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-regex-compat/PKGBUILD b/extra/haskell-regex-compat/PKGBUILD
index 507a96618..40812c431 100644
--- a/extra/haskell-regex-compat/PKGBUILD
+++ b/extra/haskell-regex-compat/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=4.1
 pkgdesc="Replaces and enhances Text.Regex"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-regex-posix/PKGBUILD b/extra/haskell-regex-posix/PKGBUILD
index 3b00616eb..230d09237 100644
--- a/extra/haskell-regex-posix/PKGBUILD
+++ b/extra/haskell-regex-posix/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2.1
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-stm/PKGBUILD b/extra/haskell-stm/PKGBUILD
index 9a9c9a962..352bd33c5 100644
--- a/extra/haskell-stm/PKGBUILD
+++ b/extra/haskell-stm/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2.1
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-syb/PKGBUILD b/extra/haskell-syb/PKGBUILD
index 64faf05ed..bcb5512f2 100644
--- a/extra/haskell-syb/PKGBUILD
+++ b/extra/haskell-syb/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2.1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index 7dbc1ce17..a246e2abf 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2.1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 446b2ffca..8ae36ebf1 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3.1
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-xhtml/PKGBUILD b/extra/haskell-xhtml/PKGBUILD
index 4a34206ad..eb11375cb 100644
--- a/extra/haskell-xhtml/PKGBUILD
+++ b/extra/haskell-xhtml/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=7.1
 pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
 url="http://hackage.haskell.org/package/xhtml"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 22a9eb932..03a459007 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2.1
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(ghc=7.0.3-2 'zlib' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
diff --git a/extra/hd2u/PKGBUILD b/extra/hd2u/PKGBUILD
index 19e7098d3..0d5bd65d5 100644
--- a/extra/hd2u/PKGBUILD
+++ b/extra/hd2u/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hd2u
 pkgver=1.0.3
 pkgrel=4
 pkgdesc="Dos2Unix text file converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://hany.sk/~hany/software/hd2u/"
 depends=('popt')
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index f43fb8f50..32b3c6b03 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -9,7 +9,7 @@ _origver=0.3-beta15
 _patchver=46
 pkgrel=1
 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.guzu.net/linux/hddtemp.php"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index b727cf225..e4804547e 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=hdf5
 pkgver=1.8.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
 url="http://www.hdfgroup.org/HDF5/"
 license=('custom')
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index a0026b927..72a1e9152 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=help2man
 pkgver=1.40.5
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/help2man/"
 license=('GPL')
 depends=('perl-locale-gettext')
diff --git a/extra/hercules/PKGBUILD b/extra/hercules/PKGBUILD
index e78a2bee3..1dd88290c 100644
--- a/extra/hercules/PKGBUILD
+++ b/extra/hercules/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A software implementation of the mainframe System/370 and ESA/390 architectures"
 url="http://www.hercules-390.org/"
 source=(http://www.hercules-390.org/$pkgname-$pkgver.tar.gz)
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 options=(!libtool)
 depends=('bzip2' 'libgcrypt' 'zlib')
diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD
index f46418f04..4ed53a1ef 100644
--- a/extra/hexedit/PKGBUILD
+++ b/extra/hexedit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hexedit
 pkgver=1.2.12
 pkgrel=5
 pkgdesc="Hex Editor for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rigaux.org/hexedit.html"
 license=('GPL')
 depends=('ncurses')
diff --git a/extra/hpoj/PKGBUILD b/extra/hpoj/PKGBUILD
index bedf7127b..26d4e4876 100644
--- a/extra/hpoj/PKGBUILD
+++ b/extra/hpoj/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hpoj
 pkgver=0.91
 pkgrel=17
 pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hpoj.sourceforge.net"
 license=('GPL' 'custom')
 depends=('perl' 'libusb-compat' 'net-snmp' 'hplip>=1.7.2')
diff --git a/extra/hspell/PKGBUILD b/extra/hspell/PKGBUILD
index 21ddd78d4..969b98476 100644
--- a/extra/hspell/PKGBUILD
+++ b/extra/hspell/PKGBUILD
@@ -4,8 +4,8 @@
 pkgbase=hspell
 pkgname=('hspell' 'hunspell-he')
 pkgver=1.1
-pkgrel=1
-arch=(i686 x86_64)
+pkgrel=1.1
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.ivrix.org.il/projects/spell-checker/"
 makedepends=('glibc' 'zlib' 'perl' 'hunspell' 'gawk')
diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD
index 38418ee68..f40457224 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.2.0b6
 pkgrel=7
 pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
 url="http://www.htdig.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('openssl')
 options=('!libtool' 'emptydirs')
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 33979e0c0..3038722a8 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=htop
 pkgver=1.0
 pkgrel=1
 pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://htop.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 8c91a9561..6b06a1d1c 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=hugin
 pkgver=2011.2.0
 pkgrel=2
 pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
 license=('GPL')
 depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD
index fefa04db4..7996411ee 100644
--- a/extra/hunspell/PKGBUILD
+++ b/extra/hunspell/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hunspell
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="Spell checker and morphological analyzer library and program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sourceforge.net/"
 license=('GPL' 'LGPL' 'MPL')
 depends=('gcc-libs' 'readline')
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index fba4aecc2..673bbdffa 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=hwloc
 pkgver=1.3.1
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org/projects/hwloc/"
 license=('BSD')
 depends=('sh' 'pciutils')
diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD
index a5c607e79..5d2845d50 100644
--- a/extra/hydrogen/PKGBUILD
+++ b/extra/hydrogen/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=hydrogen
 pkgver=0.9.5
 pkgrel=2
 pkgdesc="Advanced Drum Machine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.hydrogen-music.org/"
 depends=('libarchive' 'liblrdf' 'qt' 'jack')
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index ed87911d6..f3dc2e868 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=hylafax
 pkgver=6.0.5
 pkgrel=2
 pkgdesc="Fax Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 install='hylafax.install'
 license=('custom')
 depends=('libtiff' 'pam' 'ghostscript')
diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD
index feee6e8ff..65fda4b8c 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -4,8 +4,8 @@
 pkgbase=hyphen
 pkgname=('hyphen' 'hyphen-en')
 pkgver=2.8.3
-pkgrel=1
-arch=('i686' 'x86_64')
+pkgrel=1.1
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sf.net"
 license=('GPL' 'LGPL' 'MPL')
 groups=()
@@ -58,4 +58,4 @@ package_hyphen-en() {
       ln -sv /usr/share/hyphen/$(basename $file) .
     done
   popd
-}
\ No newline at end of file
+}
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD
index a1c7a6d7f..4d80f1568 100644
--- a/extra/i8kutils/PKGBUILD
+++ b/extra/i8kutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=i8kutils
 pkgver=1.33
 pkgrel=2
 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://people.debian.org/~dz/i8k/"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index e63f555f8..febd4be1a 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
 pkgver=1.1.4
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 7c7951c04..7058d8b7a 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=icewm
 pkgver=1.3.7
 pkgrel=1
 pkgdesc="A Window Manager designed for speed, usability, and consistency"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.icewm.org/"
 license=('LGPL')
 depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 9c62275f0..d66fbebf8 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=icu
 pkgver=4.8.1.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="International Components for Unicode library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.icu-project.org/"
 license=('custom:"icu"')
 depends=('gcc-libs' 'sh')
diff --git a/extra/id3/PKGBUILD b/extra/id3/PKGBUILD
index 6ef72b356..12929c8ce 100644
--- a/extra/id3/PKGBUILD
+++ b/extra/id3/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=id3
 pkgver=0.78
 pkgrel=3
 pkgdesc="Utility to edit id3v1 and id3v2 tags"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/id3"
 license=('BSD')
 depends=('gcc-libs')
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 483d3300f..332f24875 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=id3lib
 pkgver=3.8.3
 pkgrel=11
 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://id3lib.sourceforge.net/"
 depends=('zlib' 'gcc-libs')
diff --git a/extra/id3v2/PKGBUILD b/extra/id3v2/PKGBUILD
index ab90dcfba..ad7900dc6 100644
--- a/extra/id3v2/PKGBUILD
+++ b/extra/id3v2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=id3v2
 pkgver=0.1.12
 pkgrel=1
 pkgdesc="Utility to edit id3v2 tags"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://id3v2.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs' 'glibc' 'id3lib' 'zlib')
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index e3162ac9a..b49d417eb 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ifplugd
 pkgver=0.28
 pkgrel=7
 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/ifplugd"
 license=('GPL2')
 depends=('libdaemon' 'bash')
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index fd95d6f4f..6730537bc 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0.2
 pkgrel=1
 depends=('gcc-libs')
 pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('custom')
 options=('!libtool')
 source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 47c3ccdac..25fa6b756 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
 pkgver=6.7.4.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
 depends=('libltdl' 'lcms2' 'libxt' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD
index 9a879d865..a0196e69f 100644
--- a/extra/imake/PKGBUILD
+++ b/extra/imake/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=imake
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="X.Org imake program and related utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD
index 7e001061d..ec068d19b 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=imap
 pkgver=2007f
 pkgrel=1
 pkgdesc="An IMAP/POP server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
 url="http://www.washington.edu/imap"
 depends=('openssl' 'pam')
@@ -28,7 +28,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
-  if [ "$CARCH" == "x86_64" ]; then
+  if [ "$CARCH" == "x86_64" -o "$CARCH" == "mips64el" ]; then
          yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1
     else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1
   fi
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index dd64f75a4..83746ce4f 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=imlib
 pkgver=1.9.15
 pkgrel=10
 pkgdesc="General image handling library for X11 and Gtk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/imlib/"
 license=('GPL')
 depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8')
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 030f74f2d..4197ac22d 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -5,10 +5,10 @@
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=1
+pkgrel=1.1
 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')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 options=('!libtool')
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index 8ac2de017..5360329ce 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=indent
 pkgver=2.2.11
 pkgrel=1
 pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://indent.isidore-it.eu/beautify.html"
 depends=('glibc')
 makedepends=('texi2html')
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 079ca3009..9aeda8fef 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.48.2
 pkgrel=5
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 makedepends=('boost' 'pkg-config' 'intltool')
 depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2'
@@ -26,6 +26,11 @@ sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
 install=install
 
 build() {
+        # Workaround madd.d making a SIGILL on a NaN.
+        [ "$CARCH" == "mips64el" ] && {
+            CFLAGS=${CFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f}
+            CXXFLAGS=${CXXFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f}
+        }
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD
index 9cd6d49bd..9f80c9c06 100644
--- a/extra/iperf/PKGBUILD
+++ b/extra/iperf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iperf
 pkgver=2.0.5
 pkgrel=3
 pkgdesc="A tool to measure maximum TCP bandwidth"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://iperf.sourceforge.net"
 depends=('gcc-libs')
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
index b6f9dfcb9..bfd0634f0 100644
--- a/extra/iptraf-ng/PKGBUILD
+++ b/extra/iptraf-ng/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.0
 pkgrel=1
 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)"
 url="https://fedorahosted.org/iptraf-ng/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ncurses')
 license=('GPL2')
 replaces=('iptraf')
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index 99648219e..bb30981e5 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=irqbalance
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="IRQ balancing daemon for SMP systems"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/irqbalance"
 license=('GPL')
 depends=(glib2 numactl libcap-ng)
diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD
index bba878633..74702e9ad 100644
--- a/extra/irssi/PKGBUILD
+++ b/extra/irssi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=irssi
 pkgver=0.8.15
 pkgrel=5
 pkgdesc="Modular text mode IRC client with Perl scripting"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://irssi.org/"
 license=('GPL')
 depends=('glib2' 'openssl' 'perl')
diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD
index 56d573eb5..1d8c77b04 100644
--- a/extra/isapnptools/PKGBUILD
+++ b/extra/isapnptools/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine"
 url="http://www.roestock.demon.co.uk/isapnptools/"
 depends=('glibc')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz")
 md5sums=('b997ba56583dc850fce9b93d658dfa0c')
diff --git a/extra/ispell/PKGBUILD b/extra/ispell/PKGBUILD
index c634a1962..4cd911cbe 100644
--- a/extra/ispell/PKGBUILD
+++ b/extra/ispell/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ispell
 pkgver=3.3.02
 pkgrel=4
 pkgdesc="An interactive spell-checking program for Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ficus-www.cs.ucla.edu/geoff/ispell.html"
 license=('BSD')
 depends=('ncurses')
diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD
index 33e1cf1bc..42115abe1 100644
--- a/extra/ivtv-utils/PKGBUILD
+++ b/extra/ivtv-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ivtv-utils
 pkgver=1.4.1
 pkgrel=4
 pkgdesc="Userspace utilities for Hauppauge PVR cards"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://ivtvdriver.org"
 source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz"
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 0da149312..477a12170 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -8,12 +8,16 @@ _longname=jack-audio-connection-kit
 pkgver=0.121.3
 pkgrel=5
 pkgdesc="A low-latency audio server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('libsamplerate' 'readline')
 makedepends=('doxygen' 'libffado' 'celt')
 optdepends=('libffado: FireWire support'
             'celt: NetJACK driver')
+[ "$CARCH" = "mips64el" ] && {
+makedepends=('doxygen' 'celt')
+optdepends=('celt: NetJACK driver')
+}
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 options=('!libtool')
diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD
index e86498343..d4935a934 100644
--- a/extra/jade/PKGBUILD
+++ b/extra/jade/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=6
 _debpatch=47
 pkgdesc="James Clark's DSSSL Engine"
 url='http://www.jclark.com/jade/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('gcc-libs')
 replaces=('openjade')
diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD
index 542f1a91e..2a505cc4d 100644
--- a/extra/jasper/PKGBUILD
+++ b/extra/jasper/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=jasper
 pkgver=1.900.1
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
 license=('custom:JasPer2.0')
 depends=('libjpeg' 'freeglut' 'libxi' 'libxmu' 'mesa')
diff --git a/extra/java-access-bridge/PKGBUILD b/extra/java-access-bridge/PKGBUILD
index 619c9765d..19e7e1e03 100644
--- a/extra/java-access-bridge/PKGBUILD
+++ b/extra/java-access-bridge/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=java-access-bridge
 pkgver=1.26.2
 pkgrel=3
 pkgdesc="Java bindings for the GNOME accessibility framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://www.gnome.org"
 depends=('java-runtime' 'gtk2' 'at-spi' 'libbonobo' 'xorg-xprop')
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
index 41d2e6c13..a37658b7f 100644
--- a/extra/java-commons-daemon/PKGBUILD
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=('java-commons-daemon' 'java-jsvc')
 pkgbase=java-commons-daemon
 pkgver=1.0.8
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://commons.apache.org/daemon/"
 license=('APACHE')
 _libname=commons-daemon
diff --git a/extra/jhead/PKGBUILD b/extra/jhead/PKGBUILD
index 16d1650c4..f44742aba 100644
--- a/extra/jhead/PKGBUILD
+++ b/extra/jhead/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.93
 pkgrel=1
 pkgdesc="EXIF JPEG info parser and thumbnail remover"
 url="http://www.sentex.net/~mwandel/jhead/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
 optdepends=('libjpeg: to up-right images according to rotation tag')
diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index 71d3ac492..2f054c7bb 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=js
 pkgver=1.8.5
 pkgrel=3
 pkgdesc="JavaScript interpreter and libraries"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
 license=('GPL2')
 depends=('nspr' 'gcc-libs')
diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD
index 2f689ba64..8eadb0dce 100644
--- a/extra/json-c/PKGBUILD
+++ b/extra/json-c/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A JSON implementation in C"
 url="http://oss.metaparadigm.com/json-c/"
 license=("MIT")
-arch=('i686' 'x86_64')
+arch=(mips64el)
 depends=('glibc')
 source=(http://oss.metaparadigm.com/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('3a13d264528dcbaf3931b0cede24abae')
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index fc7a0e9a8..92672f290 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=json-glib
 pkgver=0.14.2
 pkgrel=1
 pkgdesc="JSON library built on GLib"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/JsonGlib"
 license=('GPL')
 depends=('glib2')
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index f1dce1167..9f1e4287e 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=k3b
 pkgver=2.0.2
 pkgrel=4
 pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 url="http://k3b.org/"
 license=('GPL')
 depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD
index de2d2944c..c461f329e 100644
--- a/extra/k9copy/PKGBUILD
+++ b/extra/k9copy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=k9copy
 pkgver=2.3.8
 pkgrel=2
 pkgdesc="A small utility which allows the copy of DVD under Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://k9copy.sourceforge.net"
 license=('GPL')
 depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor')
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index cad29ec16..29feeb073 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.2.2
 pkgrel=2
 pkgdesc='KDE media player'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kaffeine.kde.org"
 depends=('kdelibs' 'kdebase-runtime' 'xine-lib')
 makedepends=('pkg-config' 'cmake' 'automoc4')
diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD
index ef9e26785..9ae345965 100644
--- a/extra/kdeaccessibility/PKGBUILD
+++ b/extra/kdeaccessibility/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('kdeaccessibility-jovie'
          'kdeaccessibility-kmouth')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://accessibility.kde.org'
 license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 650be0b03..cc0569aae 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-system-config-printer-kde')
 pkgver=4.7.4
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 085a5538d..a313ced91 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-weatherwallpapers')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index e5a13d3b6..69cb5a342 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdebase-konsole
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kde.org/applications/system/konsole/'
 pkgdesc="Terminal"
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index fed053273..3c1763aa4 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdebase-runtime
 pkgver=4.7.4
 pkgrel=3
 pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 04a993706..a186ea25d 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=kde-workspace
 pkgver=4.7.4
 pkgrel=2
 pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 5511a4524..356046249 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-plasma')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 4e80a6b37..bb1c748e5 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-qyoto' 'kdebindings-smokekde')
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 4f5b5d058..7057c3b8c 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="KDE bindings for ruby"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-qtruby' 'kdebindings-smokekde')
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 7a0acda54..1e5e85828 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('kdebindings-kross-python'
 pkgver=4.7.4
 pkgrel=1
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 3221d387d..91f35ddc1 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-perlqt' 'kdebindings-smokekde')
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index eb2c7111a..2dcec58c4 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=2
 pkgdesc="Perl bindings for the Qt libraries"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 09339c550..8a32428f4 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=2
 pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 94c565d6c..c96e6c1c9 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Qt bindings for ruby"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'ruby')
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index fda759ab3..940613359 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index f347e8860..943e70baf 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index 2a2fe59d5..4da16b1db 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=2
 pkgdesc="Language independent library for KDE bindings"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt')
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index df5496acd..cce7f1e7e 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index 751311f91..dccccf6f1 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 979f2b369..cbda53904 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libspectre')
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 3920893f2..5993a1545 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 3b6bed08b..f1bc07000 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdelibs' 'avogadro' 'ocaml')
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 9eb18e25f..33f76b461 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index 6e2641b1e..9b885ec49 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index c2acba655..53ce7a39e 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 6bbce0fdd..3a2781967 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index b34fd7fd2..d18a7a4dc 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index 4f800258a..da0399a4a 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 059453365..abb06b626 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index c9ddb0c5f..48ad4fb51 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index 80f152bb2..1f784900c 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index e2defda91..4674a5ee7 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index bcfb7bd13..2c98139ca 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 4520a9e90..61c85dea2 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index ab4b93f06..29fca5ac8 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 91334e9a8..3c1d22bd0 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index 8d98021db..e2197da44 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'boost-libs')
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 49b41aa66..a75526795 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 6d117d163..5715c57da 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -45,7 +45,7 @@ pkgname=('kdegames-bomber'
          'kdegames-palapeli')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 79bdcde8e..7e0d99786 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-lib' 'libkipi')
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 3dbb7c305..3c1402ec8 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'gphoto2')
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index be6b6ea2e..7e18901a7 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime')
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index cfe08dea6..93a78cbed 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 # note on libxxf86vm:
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 2a3240bfe..4859849c8 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'qimageblitz')
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 4507ae8ac..647c3fc4e 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime')
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index 9ea2b4db2..0985773b5 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('libksane')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index a04e71180..3355032f0 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdelibs' 'libkipi')
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 6a8dc2dce..c46dc73a1 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 0aecf056f..e6605019b 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdegraphics-okular
 pkgver=4.7.4
 pkgrel=1
 pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/graphics/okular/"
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index a0e74cf03..56f05e2e0 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 9ef85adb9..e641d8e40 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A KPart for viewving SVGs"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 0389f30ee..1b842c7a8 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 019a971bf..570cad56b 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdelibs
 pkgver=4.7.4
 pkgrel=5
 pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
@@ -18,11 +18,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'kde-applications-menu.patch'
         'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
 sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
           '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
           '9cb83cb7f6394549354c6837977f9e9529127041')
 
@@ -31,8 +30,6 @@ build() {
 
        # 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
@@ -45,7 +42,7 @@ build() {
        cmake ../${pkgname}-${pkgver} \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DKDE_DISTRIBUTION_TEXT='Parabola GNU/LinuxLibre' \
                -DCMAKE_INSTALL_PREFIX=/usr \
                -DSYSCONF_INSTALL_DIR=/etc \
                -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
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/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index a33b8ed25..e9494adac 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kdelibs3
 pkgver=3.5.10
 pkgrel=11
 pkgdesc='KDE3 Core Libraries'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 6ca9a9ea1..978cbd0cc 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-mplayerthumbs')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 3d03674e9..ef294cd36 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-krfb')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 894661fc2..f1bb3f541 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdepim-runtime
 pkgver=4.7.4
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs' 'kdebase-runtime')
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 7854e5dd8..16140a51b 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-wizards')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index d480ec874..32cbf1484 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdepimlibs
 pkgver=4.7.4
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
@@ -19,6 +19,7 @@ build() {
 	cd ${srcdir}
 	mkdir build
 	cd build
+  CXX="g++" \
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index be01860fc..1c0f90d48 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -74,7 +74,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-weather')
 pkgver=4.7.4
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 4b83ae0f5..be384b3a5 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.9.0rc4
 _pkgver=0.8.99
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/extragear/base/networkmanagement'
 license=('GPL')
 depends=('kdebase-workspace' 'networkmanager')
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index d256b0c31..aea73b6b5 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('kdebase-kwrite'
          'kdesdk-kate')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 0608eea90..0a9da92ae 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -26,7 +26,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-umbrello')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index e87eca7b2..fa5020736 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('kdetoys-amor'
          'kdetoys-ktux')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
index be1df93da..20fe39875 100644
--- a/extra/kdeutils/PKGBUILD
+++ b/extra/kdeutils/PKGBUILD
@@ -18,7 +18,7 @@ pkgname=('kdeutils-ark'
          'kdeutils-sweeper')
 pkgver=4.7.4
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeutils')
diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD
index 82ab9fb0d..bfb042d6a 100644
--- a/extra/kdevelop-pg-qt/PKGBUILD
+++ b/extra/kdevelop-pg-qt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdevelop-pg-qt
 pkgver=0.9.5
 pkgrel=2
 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdevelop')
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 6bcb2cc66..de621ffa6 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.2.3
 _pkgver=4.2.3
 pkgrel=2
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdevelop-pg-qt')
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 877c469ca..dca04e520 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdevelop
 pkgver=4.2.3
 pkgrel=3
 pkgdesc="A C/C++ development environment for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite')
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 32981bc0c..c9b212884 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.3
 _pkgver=4.2.3
 pkgrel=2
 pkgdesc="A C/C++ development platform for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdelibs' 'subversion' 'qjson')
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index df2791948..d081099ab 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kommander')
 pkgver=4.7.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD
index 456888917..feb20a0f2 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdiff3
 pkgver=0.9.96
 pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kdiff3.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-runtime')
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index e8e5ccdb1..b2121f984 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kexec-tools
 pkgver=2.0.2
 pkgrel=4
 pkgdesc="Load another kernel from the currently executing Linux kernel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
 source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2"
         'kexec-tools-2.0.0-purgatory-makefile.patch'
diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD
index 2a9681e31..432c6b015 100644
--- a/extra/kino/PKGBUILD
+++ b/extra/kino/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kino
 pkgver=1.3.4
 pkgrel=4
 pkgdesc="A non-linear DV editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kinodv.org/"
 license=('GPL')
 depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm')
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index 015044fe8..edd6adaf0 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -6,9 +6,9 @@
 pkgname=kismet
 pkgver=2011_03_R2
 _realver="${pkgver//_/-}"
-pkgrel=2
+pkgrel=2.1
 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kismetwireless.net/"
 license=('GPL')
 depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
@@ -33,7 +33,8 @@ build() {
 
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
-                --localstatedir=/var
+                --localstatedir=/var \
+		--build=$CHOST --host=$CHOST
     make dep
     make
 
diff --git a/extra/kobodeluxe/PKGBUILD b/extra/kobodeluxe/PKGBUILD
index 228930797..8a52ce946 100644
--- a/extra/kobodeluxe/PKGBUILD
+++ b/extra/kobodeluxe/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kobodeluxe
 pkgver=0.5.1
 pkgrel=3
 pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.olofson.net/kobodl/"
 license=('GPL' 'LGPL')
 depends=('libjpeg' 'libpng' 'sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache')
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index f0be52a61..01d3dad85 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -38,12 +38,16 @@ pkgname=(
 )
 pkgver=2.3.3
 pkgrel=11
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el') 
 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')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
+             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
+             'libwpg' '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')
@@ -222,6 +226,10 @@ package_koffice-krita(){
 	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
 		 'koffice-plugins' 'poppler-qt' 'opengtl')
         optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
+[ "$CARCH" = "mips64el" ] && \
+	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
+		 'koffice-plugins' 'poppler-qt')
+        optdepends=('koffice-filters: import/export filters')
 	install=krita.install
         cd "${srcdir}/build/krita"
         make DESTDIR="${pkgdir}" install
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 3694bc377..543cfd671 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=konversation
 pkgver=1.4
 pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
 depends=('kdebase-runtime' 'kdepimlibs' 'python')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
index 66bea244c..a3c3ed9e2 100644
--- a/extra/kradio/PKGBUILD
+++ b/extra/kradio/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kradio
 pkgver=4.0.2
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 pkgdesc="A comfortable KDE radio application"
 url="http://kradio.sourceforge.net/"
diff --git a/extra/ksensors/PKGBUILD b/extra/ksensors/PKGBUILD
index 6db8e7e85..43c278c66 100644
--- a/extra/ksensors/PKGBUILD
+++ b/extra/ksensors/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ksensors
 pkgver=0.7.3
 pkgrel=5
 pkgdesc="ksensors is nice lm_sensors frontend for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ksensors.sourceforge.net/"
 license=("GPL")
 depends=("lm_sensors>=3.0.0" 'kdelibs3')
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD
index f9d9a6322..99e58f307 100644
--- a/extra/kshutdown/PKGBUILD
+++ b/extra/kshutdown/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kshutdown
 pkgver=2.0
 pkgrel=1
 pkgdesc="Shutdown Utility for KDE"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://kshutdown.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-workspace')
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index 2cb7f2952..c7f2f5cde 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ktorrent
 pkgver=4.1.3
 pkgrel=1
 pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ktorrent.org"
 license=('GPL2')
 depends=('libktorrent' 'kdebase-workspace' 'taglib')
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 440538661..02cdb957a 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.2.0
 pkgrel=2
 pkgdesc="A WebKit browser component for KDE"
 url="http://opendesktop.org/content/show.php?content=127960"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD
index 1da638913..64a24ebb6 100644
--- a/extra/lablgtk/PKGBUILD
+++ b/extra/lablgtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lablgtk
 pkgver=1.2.7
 pkgrel=8
 pkgdesc=" An Objective Caml interface to gtk+"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
 license=('LGPL')
 depends=('gtk')
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index baf833da8..20a6b9985 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lablgtk2
 pkgver=2.14.2
 pkgrel=4
 pkgdesc=" An Objective Caml interface to gtk2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://lablgtk.forge.ocamlcore.org/"
 depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2')
diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD
index 3f0fb5aad..e7009dfdf 100644
--- a/extra/ladspa/PKGBUILD
+++ b/extra/ladspa/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ladspa
 pkgver=1.13
 pkgrel=3
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 license=('LGPL')
 url="http://www.ladspa.org/"
 depends=('gcc-libs')
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index ecc002737..9a7dec0c7 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -11,7 +11,7 @@ url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran')
 depends=("blas=${pkgver}")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
         lapack-3.1.1-make.inc.patch
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index a9796f0b5..e80c4c714 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=latex2rtf
 pkgver=2.1.0
 pkgrel=1
 pkgdesc="LaTeX to RTF converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://latex2rtf.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'imagemagick' 'ghostscript')
diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD
index fa036bb63..a251c572a 100644
--- a/extra/lbreakout2/PKGBUILD
+++ b/extra/lbreakout2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lbreakout2
 pkgver=2.6.3
 pkgrel=2
 pkgdesc="A breakout game with nice effects, graphics, and sounds"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lgames.sourceforge.net"
 license=('GPL')
 depends=('sdl_mixer' 'libpng')
diff --git a/extra/lcab/PKGBUILD b/extra/lcab/PKGBUILD
index 35252cdbb..cda54a126 100644
--- a/extra/lcab/PKGBUILD
+++ b/extra/lcab/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lcab
 pkgver=1.0b12
 pkgrel=3
 pkgdesc="A program to make Microsoft cabinet files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://freshmeat.net/projects/lcab/"
 depends=('glibc')
diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index effc73c13..97ef4c538 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Lightweight color management development library/engine"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('libtiff>=3.9.4')
 url="http://www.littlecms.com"
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index 0ac1474d8..29b19d6b5 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lcms2
 pkgver=2.3
 pkgrel=1
 pkgdesc="Small-footprint color management engine, version 2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('libtiff')
 url="http://www.littlecms.com"
diff --git a/extra/leafpad/PKGBUILD b/extra/leafpad/PKGBUILD
index 179133ff4..67317dd6a 100644
--- a/extra/leafpad/PKGBUILD
+++ b/extra/leafpad/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=leafpad
 pkgver=0.8.18.1
 pkgrel=2
 pkgdesc="A notepad clone for GTK+ 2.0"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tarot.freeshell.org/leafpad/"
 license=('GPL')
 depends=('gtk2' 'desktop-file-utils')
diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD
index b1ec2b92b..8435e0a45 100644
--- a/extra/lensfun/PKGBUILD
+++ b/extra/lensfun/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lensfun
 pkgver=0.2.5
 pkgrel=2
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://lensfun.berlios.de/"
 license=('LGPL3')
 depends=('glibc' 'glib2')
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index 5d0d91350..42fe30077 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lesstif
 pkgver=0.95.2
 pkgrel=4
 pkgdesc="LGPL'd re-implementation of Motif"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesstif.org/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 3e1513ed6..1c6c078e9 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lftp
 pkgver=4.3.4
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
 optdepends=('perl: needed for convert-netscape-cookies and verify-file')
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index 8107c96b2..265e64f2b 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.0
 pkgrel=1
 pkgdesc="A cross-platform audio output library and plugins"
 url="http://www.xiph.org/ao"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'alsa-lib')
 makedepends=('libpulse')
diff --git a/extra/libart-lgpl/PKGBUILD b/extra/libart-lgpl/PKGBUILD
index c7cdbfeac..614af1640 100644
--- a/extra/libart-lgpl/PKGBUILD
+++ b/extra/libart-lgpl/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=2.3.21
 pkgrel=1
 pkgdesc="A library for high-performance 2D graphics"
 url="http://www.levien.com/libart/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('glibc')
 source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2)
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 3bf677188..e83115de8 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libass
 pkgver=0.10.0
 pkgrel=3
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/libass/"
 license=('BSD')
 depends=('enca' 'fontconfig' 'fribidi')
diff --git a/extra/libassuan/PKGBUILD b/extra/libassuan/PKGBUILD
index ce2ce2fe0..1a5f2a8e0 100644
--- a/extra/libassuan/PKGBUILD
+++ b/extra/libassuan/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libassuan
 pkgver=2.0.3
 pkgrel=1
 pkgdesc="A IPC library used by some GnuPG related software"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnupg.org/related_software/libassuan"
 depends=('libgpg-error')
diff --git a/extra/libasyncns/PKGBUILD b/extra/libasyncns/PKGBUILD
index 06ac6eaac..93c625931 100644
--- a/extra/libasyncns/PKGBUILD
+++ b/extra/libasyncns/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libasyncns
 pkgver=0.8
 pkgrel=3
 pkgdesc="A C library for Linux/Unix for executing name service queries asynchronously"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/libasyncns"
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD
index 7a1ec6b47..38c6764a1 100644
--- a/extra/libatasmart/PKGBUILD
+++ b/extra/libatasmart/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libatasmart
 pkgver=0.18
-pkgrel=1
+pkgrel=1.1
 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('udev>=174')
 url="http://0pointer.de/blog/projects/being-smart.html"
diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD
index 98a6836f5..af377fd49 100644
--- a/extra/libavc1394/PKGBUILD
+++ b/extra/libavc1394/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libavc1394
 pkgver=0.5.4
 pkgrel=1
 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands."
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/libavc1394/"
 license=('LGPL')
 depends=('libraw1394')
diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD
index 760cd2510..86bd35dc1 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libbluedevil
 pkgver=1.9.1
 pkgrel=1
 pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://projects.kde.org/projects/playground/libs/libbluedevil"
 license=('GPL')
 depends=('qt' 'bluez')
diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD
index abfb2a186..a80eb9217 100644
--- a/extra/libbonobo/PKGBUILD
+++ b/extra/libbonobo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libbonobo
 pkgver=2.32.1
 pkgrel=1
 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('orbit2' 'libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig' 'flex')
diff --git a/extra/libbonoboui/PKGBUILD b/extra/libbonoboui/PKGBUILD
index ef75ec844..2dc72c61e 100644
--- a/extra/libbonoboui/PKGBUILD
+++ b/extra/libbonoboui/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libbonoboui
 pkgver=2.24.5
 pkgrel=1
 pkgdesc="User Interface library for Bonobo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('libgnomecanvas' 'libgnome')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index 250747ac0..4cedfdf0d 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libburn
 pkgver=1.1.8 #.pl01
 pkgrel=1
 pkgdesc="Library for reading, mastering and writing optical discs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libburnia.pykix.org/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index 65485d162..75ebd7d0b 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libcaca
 pkgver=0.99.beta17
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Color AsCii Art library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libcaca.zoy.org/"
 depends=('imlib2' 'ncurses>=5.7')
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index 92f2b3084..44c66a08e 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.28
 pkgrel=2
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
 makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 1e3544bfd..aee0abad5 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcap-ng
 pkgver=0.6.6
 pkgrel=1
 pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://people.redhat.com/sgrubb/libcap-ng/"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc')
diff --git a/extra/libcdaudio/PKGBUILD b/extra/libcdaudio/PKGBUILD
index 64159d23e..2a03b2494 100644
--- a/extra/libcdaudio/PKGBUILD
+++ b/extra/libcdaudio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcdaudio
 pkgver=0.99.12
 pkgrel=5
 pkgdesc="Library for controlling Audio CDs and interacting with CDDB"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libcdaudio.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD
index 51b3b7d02..f368ad6c8 100644
--- a/extra/libcddb/PKGBUILD
+++ b/extra/libcddb/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libcddb
 pkgver=1.3.2
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
 url="http://sourceforge.net/projects/libcddb/"
 license=('LGPL')
diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index 4c309a65e..419d33b11 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libcdio
 pkgver=0.82
-pkgrel=1
+pkgrel=1.1
 pkgdesc="GNU Compact Disc Input and Control Library"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/libcdio/"
 depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses')
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index a505d4e56..5a9304dd1 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD
index d1ee325e4..7c289746d 100644
--- a/extra/libchewing/PKGBUILD
+++ b/extra/libchewing/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libchewing
 pkgver=0.3.3
 pkgrel=1
 pkgdesc='Intelligent Zhuyin input method library for traditional Chinese'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://chewing.csie.net/'
 license=('GPL')
 options=('!libtool')
diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD
index 5d19edc14..044155702 100644
--- a/extra/libcroco/PKGBUILD
+++ b/extra/libcroco/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libcroco
 pkgver=0.6.3
 pkgrel=1
 pkgdesc="A CSS parsing library"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('glib2' 'libxml2')
 makedepends=('intltool')
 license=('LGPL')
diff --git a/extra/libcue/PKGBUILD b/extra/libcue/PKGBUILD
index 95e1c4d21..ba69e0e57 100644
--- a/extra/libcue/PKGBUILD
+++ b/extra/libcue/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libcue
 pkgver=1.4.0
 pkgrel=2
 pkgdesc='Parses so-called cue sheets and handles the parsed data'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/libcue/'
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/libdaemon/PKGBUILD b/extra/libdaemon/PKGBUILD
index c6bbc1c9c..092a06c90 100644
--- a/extra/libdaemon/PKGBUILD
+++ b/extra/libdaemon/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="A lightweight C library which eases the writing of UNIX daemons"
 url="http://0pointer.de/lennart/projects/libdaemon/"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 source=(http://0pointer.de/lennart/projects/libdaemon/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD
index 21eca6bfb..4776c7fa9 100644
--- a/extra/libdatrie/PKGBUILD
+++ b/extra/libdatrie/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe."
 url="http://linux.thai.net/projects/datrie"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 options=('!libtool' '!emptydirs')
 source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 29dcb61fa..f31ab3657 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdbusmenu-qt
 pkgver=0.9.0
 pkgrel=2
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/libdbusmenu-qt"
 license=('GPL')
 depends=('qt')
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index aaba1b8d3..674c62bc5 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdc1394
 pkgver=2.1.3
 pkgrel=2
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://sourceforge.net/projects/libdc1394/"
 depends=('libraw1394>=2.0.7' 'libusb')
diff --git a/extra/libdc1394/fix-videodev.h.patch b/extra/libdc1394/fix-videodev.h.patch
new file mode 100644
index 000000000..560337978
--- /dev/null
+++ b/extra/libdc1394/fix-videodev.h.patch
@@ -0,0 +1,53 @@
+From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
+From: David Moore <david.moore@gmail.com>
+Date: Sun, 27 Mar 2011 22:48:15 -0700
+Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
+
+---
+ libdc1394/ChangeLog            |    3 +++
+ libdc1394/configure.in         |    3 +++
+ libdc1394/examples/Makefile.am |    2 ++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
+index e1355de..536ccae 100644
+--- a/libdc1394/ChangeLog
++++ b/libdc1394/ChangeLog
+@@ -1,3 +1,6 @@
++2011-03-27  David Moore  <david.moore@gmail.com>
++	* Conditionally compile dc1394_vloopback only when linux/video.h exists
++
+ 2011-01-02  David Moore  <david.moore@gmail.com>
+ 	* dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
+ 	* Update NEWS, README, AUTHORS and version for release 2.1.3.
+diff --git a/libdc1394/configure.in b/libdc1394/configure.in
+index 69babab..bdddc9b 100644
+--- a/libdc1394/configure.in
++++ b/libdc1394/configure.in
+@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
+ AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
+ AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
+ 
++AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
++AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
++
+ AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
+ 
+ AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
+diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
+index fcebf18..035612e 100644
+--- a/libdc1394/examples/Makefile.am
++++ b/libdc1394/examples/Makefile.am
+@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
+ B = dc1394_reset_bus
+ 
+ if HAVE_LINUX
++if HAVE_VIDEODEV
+ B += dc1394_vloopback
++endif
+ if HAVE_XV
+ A += dc1394_multiview
+ endif
+-- 
+1.7.0.1
+
diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD
index bc42228f3..d642da853 100644
--- a/extra/libdca/PKGBUILD
+++ b/extra/libdca/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdca
 pkgver=0.0.5
 pkgrel=3
 pkgdesc="Free library for decoding DTS Coherent Acoustics streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.videolan.org/developers/libdca.html"
 depends=('sh')
diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD
index f1eccb6a8..82c606ebd 100644
--- a/extra/libdiscid/PKGBUILD
+++ b/extra/libdiscid/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libdiscid
 pkgver=0.2.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="A Library for creating MusicBrainz DiscIDs"
 url="http://musicbrainz.org/doc/libdiscid"
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index fb532e990..6f3f3eb53 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libdmapsharing
 pkgver=2.9.12
 pkgrel=1
 pkgdesc="A library that implements the DMAP family of protocols"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.flyn.org/projects/libdmapsharing/index.html"
 license=('LGPL2.1')
 depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2')
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index 30f02eb3c..a8a128035 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.7.4
 pkgrel=1
 pkgdesc="A software for reading and writing Data Matrix 2D barcodes"
 url="http://www.libdmtx.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc' 'imagemagick')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD
index 3397db220..bb52faac4 100644
--- a/extra/libdmx/PKGBUILD
+++ b/extra/libdmx/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdmx
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X11 Distributed Multihead extension library"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('dmxproto' 'libxext')
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 866be38b3..097bf9798 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdrm
 pkgver=2.4.30
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('glibc' 'libpciaccess')
 makedepends=('cairo')
diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD
index d8b127c48..2c77ecc71 100644
--- a/extra/libdv/PKGBUILD
+++ b/extra/libdv/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libdv
 pkgver=1.0.0
-pkgrel=3
+pkgrel=3.1
 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libdv.sourceforge.net/"
 license=('LGPL')
 depends=('popt')
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index 9ac9fc40a..7297fa12d 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libdvbpsi
 pkgver=0.2.2
 pkgrel=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('glibc')
 options=('!libtool')
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index 8ab1a372a..06764d19f 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.11
 pkgrel=1
 pkgdesc="A portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 options=('!libtool')
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index 21fafd52b..8198e638e 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libdvdnav
 pkgver=4.2.0
 pkgrel=2
 pkgdesc="The library for xine-dvdnav plugin."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://dvdnav.mplayerhq.hu/"
 depends=('libdvdread')
diff --git a/extra/libdvdread/PKGBUILD b/extra/libdvdread/PKGBUILD
index 53a51bcee..7c2420d59 100644
--- a/extra/libdvdread/PKGBUILD
+++ b/extra/libdvdread/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libdvdread
 pkgver=4.2.0
 pkgrel=1
 pkgdesc="Provides a simple foundation for reading DVD video disks"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://dvdnav.mplayerhq.hu"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index 7302de3d0..fe3e45732 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libebml
 pkgver=1.2.2
 pkgrel=2
 pkgdesc="Extensible Binary Meta Language library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libebml/"
 license=('LGPL')
 depends=('gcc-libs')
diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD
index b4cdf8f55..76dc2d222 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libepc
 pkgver=0.4.3
 pkgrel=1
 pkgdesc="Easy Publish and Consume Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://live.gnome.org/libepc"
 depends=('gtk3' 'avahi' 'libsoup')
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index eccaf4151..ae2f04677 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libetpan
 pkgver=1.0
 pkgrel=4
 pkgdesc="A portable middleware for email access"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/extra/libexif/PKGBUILD b/extra/libexif/PKGBUILD
index 9755ed6a5..580c70626 100644
--- a/extra/libexif/PKGBUILD
+++ b/extra/libexif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libexif
 pkgver=0.6.20
 pkgrel=1
 pkgdesc="A library to parse an EXIF file and read the data from those tags"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://sourceforge.net/projects/libexif"
 depends=('glibc')
diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD
index 580f63adc..3bc12b63f 100644
--- a/extra/libffado/PKGBUILD
+++ b/extra/libffado/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libffado
 pkgver=2.0.1
 pkgrel=5
 pkgdesc="Driver for FireWire audio devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ffado.org/"
 license=('GPL')
 depends=('libiec61883' 'libavc1394' 'libsigc++'
@@ -29,6 +29,8 @@ build() {
 
   if [ "$CARCH" = "x86_64" ]; then
     sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct
+  elif [ "$CARCH" = "mips64el" ]; then
+    sed -i "s/-mn32/-mn32 $CFLAGS/g" SConstruct
   else
     sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct
   fi
diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD
index 1d7ca277f..3b3393ab0 100644
--- a/extra/libfontenc/PKGBUILD
+++ b/extra/libfontenc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libfontenc
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="X11 font encoding library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('zlib')
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index ee278cfd7..8802d6d1c 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libfs
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="X11 Font Services Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto' 'fontsproto')
diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD
index b43d6ab53..d4a8f3cba 100644
--- a/extra/libftdi/PKGBUILD
+++ b/extra/libftdi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libftdi
 pkgver=0.19
 pkgrel=1
 pkgdesc="A library to talk to FTDI chips"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.intra2net.com/en/developer/libftdi/download.php"
 license=('GPL2' 'LGPL2.1')
 depends=('libusb-compat' 'gcc-libs')
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index eb86b103d..ffc2c48ed 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgadu
 pkgver=1.11.0
 pkgrel=1
 pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://toxygen.net/libgadu/"
 license=('GPL')
 depends=('openssl')
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index aac075ddd..145f1465c 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgda
 pkgver=5.0.2
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
          'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index 4512150d0..57febb731 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgdata
 pkgver=0.10.1
 pkgrel=1
 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsoup-gnome' 'liboauth')
 makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index f8d253881..1b1eb5640 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgdiplus
 pkgver=2.10
 pkgrel=1
 pkgdesc="An Open Source Implementation of the GDI+ API"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 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')
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 6e974845c..8879cbce9 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
 license=('LGPL2.1')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
diff --git a/extra/libggz/PKGBUILD b/extra/libggz/PKGBUILD
index 22b350783..f3b7a4b3d 100644
--- a/extra/libggz/PKGBUILD
+++ b/extra/libggz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libggz
 pkgver=0.0.14.1
 pkgrel=2
 pkgdesc="GGZ base library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ggzgamingzone.org/"
 license=('LGPL')
 depends=('libgcrypt')
diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD
index b5d0cf67a..d707b9f02 100644
--- a/extra/libgksu/PKGBUILD
+++ b/extra/libgksu/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgksu
 pkgver=2.0.12
 pkgrel=4
 pkgdesc="gksu authorization library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.nongnu.org/gksu/index.html"
 license=(GPL)
 depends=('gconf' 'gtk2' 'libgnome-keyring' 'libgtop' 'startup-notification')
diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD
index b5a6d14f4..e1c71bf59 100644
--- a/extra/libglade/PKGBUILD
+++ b/extra/libglade/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libglade
 pkgver=2.6.4
 pkgrel=2
 pkgdesc="Allows you to load glade interface files in a program at runtime"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gtk2>=2.16.0' 'libxml2>=2.7.3')
 makedepends=('python2' 'pkgconfig')
diff --git a/extra/libglademm/PKGBUILD b/extra/libglademm/PKGBUILD
index 2b5e5ffcf..11b55abe6 100644
--- a/extra/libglademm/PKGBUILD
+++ b/extra/libglademm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libglademm
 pkgver=2.6.7
 pkgrel=2
 pkgdesc="A C++ wrapper for libglade."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkmm.sourceforge.net/"
 license=('LGPL')
 depends=('libglade>=2.6.3' 'gtkmm>=2.14.1')
diff --git a/extra/libgme/PKGBUILD b/extra/libgme/PKGBUILD
index 87cf33388..2e874487d 100644
--- a/extra/libgme/PKGBUILD
+++ b/extra/libgme/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Video game music file emulation/playback library"
 url="http://game-music-emu.googlecode.com/"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 makedepends=('cmake')
 source=(ftp://ftp.archlinux.org/other/game-music-emu/game-music-emu-${pkgver}.tar.xz)
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 7f4b0e095..3b12c60d2 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgnome-keyring
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('dbus-core' 'libgcrypt' 'glib2')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/libgnome-media-profiles/PKGBUILD b/extra/libgnome-media-profiles/PKGBUILD
index 93472debf..ee4b19be5 100644
--- a/extra/libgnome-media-profiles/PKGBUILD
+++ b/extra/libgnome-media-profiles/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libgnome-media-profiles
 pkgver=3.0.0
 pkgrel=2
 pkgdesc=""
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD
index 9c7318fe2..a654b2790 100644
--- a/extra/libgnome/PKGBUILD
+++ b/extra/libgnome/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libgnome
 pkgname=('libgnome' 'libgnome-data')
 pkgver=2.32.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28')
 options=('!libtool' '!emptydirs')
diff --git a/extra/libgnomecanvas/PKGBUILD b/extra/libgnomecanvas/PKGBUILD
index 6bc8b6893..5863266cd 100644
--- a/extra/libgnomecanvas/PKGBUILD
+++ b/extra/libgnomecanvas/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgnomecanvas
 pkgver=2.30.3
 pkgrel=1
 pkgdesc="The GNOME Canvas library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21')
 makedepends=('pkgconfig' 'intltool')
diff --git a/extra/libgnomecanvasmm/PKGBUILD b/extra/libgnomecanvasmm/PKGBUILD
index 4cde2b6fa..abc32dd66 100644
--- a/extra/libgnomecanvasmm/PKGBUILD
+++ b/extra/libgnomecanvasmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgnomecanvasmm
 pkgver=2.26.0
 pkgrel=2
 pkgdesc="A C++ wrapper for libgnomecanvas."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtkmm' 'libgnomecanvas')
 makedepends=('pkgconfig')
diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD
index 2b142f59a..c23d9a555 100644
--- a/extra/libgnomekbd/PKGBUILD
+++ b/extra/libgnomekbd/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.2.0
 pkgrel=1
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libxklavier' 'gtk3' 'dconf')
 makedepends=('intltool' 'gobject-introspection')
diff --git a/extra/libgnomemm/PKGBUILD b/extra/libgnomemm/PKGBUILD
index 7696a5f30..7603b20cd 100644
--- a/extra/libgnomemm/PKGBUILD
+++ b/extra/libgnomemm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgnomemm
 pkgver=2.30.0
 pkgrel=1
 pkgdesc="C++ bindings for libgnome."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libgnome>=2.28.0' 'gtkmm>=2.20.0')
 makedepends=('pkgconfig')
diff --git a/extra/libgnomeui/PKGBUILD b/extra/libgnomeui/PKGBUILD
index 7538c8acc..2f88aa992 100644
--- a/extra/libgnomeui/PKGBUILD
+++ b/extra/libgnomeui/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgnomeui
 pkgver=2.24.4
 pkgrel=1
 pkgdesc="User Interface library for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/libgnomeuimm/PKGBUILD b/extra/libgnomeuimm/PKGBUILD
index 4cb62baf0..4c4b8c8d5 100644
--- a/extra/libgnomeuimm/PKGBUILD
+++ b/extra/libgnomeuimm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgnomeuimm
 pkgver=2.28.0
 pkgrel=2
 pkgdesc="A C++ wrapper for libgnomeui"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://gtkmm.sourceforge.net/"
 license=('GPL')
 depends=('libgnomeui>=2.24.4' 'libgnomecanvasmm>=2.26.0' 'libgnomemm>=2.30.0' 'libglademm>=2.6.7' 'gconfmm>=2.28.2' 'gnome-vfsmm>=2.26.0')
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index b2fe27b17..729d51907 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgphoto2
 pkgver=2.4.11
 pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=(LGPL)
 depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat')
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 18e28d3e2..e9bbd1e75 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgpod
 pkgver=0.8.2
 pkgrel=2
 pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
 makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index 87a0928a8..7eb4462be 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libgsf
 pkgver=1.14.22
 pkgrel=2
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
 url="http://www.gnome.org/"
 license=('GPL' 'LGPL')
diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD
index ff795d406..6725257f8 100644
--- a/extra/libgtkhtml/PKGBUILD
+++ b/extra/libgtkhtml/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgtkhtml
 pkgver=2.11.1
 pkgrel=3
 pkgdesc="An HTML library for GTK"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gtk2>=2.22.1' 'libxml2>=2.7.8')
 makedepends=('perlxml')
diff --git a/extra/libgtop/PKGBUILD b/extra/libgtop/PKGBUILD
index e0da8a86e..abca78872 100644
--- a/extra/libgtop/PKGBUILD
+++ b/extra/libgtop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgtop
 pkgver=2.28.4
 pkgrel=1
 pkgdesc="A library that read information about processes and the running system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('glib2' 'libxau' 'texinfo')
 makedepends=('intltool' 'gobject-introspection')
diff --git a/extra/libguess/PKGBUILD b/extra/libguess/PKGBUILD
index ff92396a1..4cd4ec315 100644
--- a/extra/libguess/PKGBUILD
+++ b/extra/libguess/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='High-speed character set detection library'
 url='http://atheme.org/project/libguess'
 license=('BSD')
 depends=('libmowgli')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://distfiles.atheme.org/libguess-${pkgver}.tar.gz")
 sha1sums=('2760e63b71497506208f9d6269ec52f83bfc6f0b')
 
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
index ec1f2617e..73a72f9f5 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgusb
 pkgver=0.1.3
 pkgrel=1
 pkgdesc="GLib wrapper around libusb1"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://gitorious.org/gusb/"
 license=('LGPL2.1')
 depends=('udev')
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index d4b3b4e3b..e98bc6ae5 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgweather
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD
index b5dd98216..a3a99a4cd 100644
--- a/extra/libhangul/PKGBUILD
+++ b/extra/libhangul/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.1.0
 pkgrel=1
 _filecode=6000
 pkgdesc='Input method library for Korean'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kldp.net/projects/hangul/'
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD
index 3f77290ea..56c6f19b2 100644
--- a/extra/libical/PKGBUILD
+++ b/extra/libical/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libical
 pkgver=0.46
 pkgrel=1
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/freeassociation/'
 license=('LGPL' 'MPL')
 depends=('glibc')
diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD
index a350cfaf7..09c274fb3 100644
--- a/extra/libice/PKGBUILD
+++ b/extra/libice/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libice
 pkgver=1.0.7
 pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto>=7.0.18')
 makedepends=('pkgconfig' 'xtrans>=1.2.5')
diff --git a/extra/libid3tag/PKGBUILD b/extra/libid3tag/PKGBUILD
index 759e99240..589902094 100644
--- a/extra/libid3tag/PKGBUILD
+++ b/extra/libid3tag/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libid3tag
 pkgver=0.15.1b
 pkgrel=6
 pkgdesc="library for id3 tagging"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.underbit.com/products/mad/"
 license=('GPL')
 depends=('zlib')
diff --git a/extra/libidl2/PKGBUILD b/extra/libidl2/PKGBUILD
index 87bb7c218..a2f678871 100644
--- a/extra/libidl2/PKGBUILD
+++ b/extra/libidl2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libidl2
 pkgver=0.8.14
 pkgrel=1
 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('glib2>=2.24.0' 'texinfo')
 makedepends=('pkgconfig')
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index 8428590f6..67d89a5e1 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.22
 pkgrel=1
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="http://www.gnu.org/software/libidn/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 depends=('glibc' 'texinfo')
 makedepends=('pkgconfig')
diff --git a/extra/libiec61883/PKGBUILD b/extra/libiec61883/PKGBUILD
index cd00382cc..cec337815 100644
--- a/extra/libiec61883/PKGBUILD
+++ b/extra/libiec61883/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libiec61883
 pkgver=1.2.0
 pkgrel=3
 pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/linux/libs/ieee1394/"
 license=('LGPL')
 depends=('libraw1394')
diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD
index 98f7d7107..58c0d95a0 100644
--- a/extra/libieee1284/PKGBUILD
+++ b/extra/libieee1284/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libieee1284
 pkgver=0.2.11
 pkgrel=3
 pkgdesc="A library to query devices connected in parallel port."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://cyberelk.net/tim/libieee1284"
 depends=('python2')
@@ -16,7 +16,7 @@ md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man PYTHON=/usr/bin/python2
   make
 }
 
diff --git a/extra/libifp/PKGBUILD b/extra/libifp/PKGBUILD
index 248d449c5..fc3667670 100644
--- a/extra/libifp/PKGBUILD
+++ b/extra/libifp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libifp
 pkgver=1.0.0.2
 pkgrel=3
 pkgdesc="General-purpose library-driver for iRiver's iFP portable audio players"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://ifp-driver.sourceforge.net/libifp/"
 depends=('libusb-compat')
diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD
index 1a9d5ea59..b5e17535b 100644
--- a/extra/libimobiledevice/PKGBUILD
+++ b/extra/libimobiledevice/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=libimobiledevice
 pkgver=1.1.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd')
 makedepends=('swig' 'python2')
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 0de4645b0..5f39e3bdf 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libnova' 'cfitsio' 'boost-libs')
 makedepends=('pkgconfig' 'cmake' 'boost')
 provides=('indilib')
diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD
index a9a47dec7..4266b08f4 100644
--- a/extra/libiodbc/PKGBUILD
+++ b/extra/libiodbc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libiodbc
 pkgver=3.52.7
 pkgrel=4
 pkgdesc='Independent Open DataBase Connectivity for Linux'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/"
 license=('LGPL')
 depends=('glibc' 'sh')
diff --git a/extra/libirman/PKGBUILD b/extra/libirman/PKGBUILD
index 3305a78eb..db0de83f1 100644
--- a/extra/libirman/PKGBUILD
+++ b/extra/libirman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libirman
 pkgver=0.4.5
 pkgrel=2
 pkgdesc="Irman driver lcd library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org"
 license=('LGPL')
 options=(!libtool)
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 39e306723..471b62f7f 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.8
 pkgrel=1
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia.pykix.org/wiki/Libisoburn"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libburn>=1.1.8' 'libisofs>=1.1.6' 'readline')
 options=('!libtool')
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index c3cfed509..09ccc5a16 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libisofs
 pkgver=1.1.6
 pkgrel=1
 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libburnia.pykix.org/"
 license=('GPL')
 depends=('acl' 'zlib')
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 51aa6df6f..8a601edea 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libjpeg-turbo
 pkgver=1.1.1
 pkgrel=4
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libjpeg-turbo.virtualgl.org/"
 license=('GPL' 'custom')
 depends=('glibc')
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 23dd6b34f..3305f740f 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'lcms')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 3497133cd..e2cfe2cfc 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index 91ccc2eb6..b85c2918f 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index afe38ff96..40cf07e56 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 11ec687ab..98d783a80 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.7.4
 pkgrel=1
 pkgdesc="An image scanning library"
 url="http://kde.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'sane')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD
index 51f23e123..f6ef17583 100644
--- a/extra/libksba/PKGBUILD
+++ b/extra/libksba/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libksba
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="A CMS and X.509 access library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
 depends=('bash' 'libgpg-error' 'glibc')
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index 43d1a42d9..40ef899b5 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libktorrent
 pkgver=1.1.3
 pkgrel=1
 pkgdesc="A BitTorrent protocol implementation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ktorrent.org"
 license=('GPL2')
 depends=('kdelibs')
diff --git a/extra/liblastfm/PKGBUILD b/extra/liblastfm/PKGBUILD
index 13e5dd98e..a67e1cdfe 100644
--- a/extra/liblastfm/PKGBUILD
+++ b/extra/liblastfm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=liblastfm
 pkgver=0.3.3
 pkgrel=2
 pkgdesc="A collection of libraries to help you integrate Last.fm services into your rich desktop software"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/mxcl/liblastfm/"
 license=('GPL')
 depends=('libsamplerate' 'fftw' 'qt')
diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD
index eae1ff944..4963a4649 100644
--- a/extra/liblo/PKGBUILD
+++ b/extra/liblo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=liblo
 pkgver=0.26
 pkgrel=1
 pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://plugin.org.uk/liblo/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD
index d7a753f32..c39052981 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liblouis
 pkgver=2.3.0
 pkgrel=1
 pkgdesc="Open-source braille translator and back-translator"
-arch=(i686 x86_64)
+arch=(mips64el)
 url="http://code.google.com/p/liblouis/"
 license=('GPL3')
 depends=(glibc)
diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD
index 67f9170d6..445511d75 100644
--- a/extra/liblqr/PKGBUILD
+++ b/extra/liblqr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liblqr
 pkgver=0.4.1
 pkgrel=2
 pkgdesc="A seam-carving C/C++ library called Liquid Rescale"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://liblqr.wikidot.com/"
 license=('GPL')
 depends=('glib2')
diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index 49a0fe584..f740dbff7 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liblrdf
 pkgver=0.4.0
 pkgrel=9
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
 depends=('raptor' 'ladspa')
 makedepends=('pkgconfig')
diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD
index 842fbe930..14f32b061 100644
--- a/extra/libmad/PKGBUILD
+++ b/extra/libmad/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmad
 pkgver=0.15.1b
 pkgrel=5
 pkgdesc="A high-quality MPEG audio decoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.underbit.com/products/mad/"
 license=('GPL')
 depends=('glibc')
@@ -29,7 +29,7 @@ build() {
   patch -p1 -i "${srcdir}/optimize.diff"
   CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1"
   autoconf
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --enable-fpm=default
   make
 }
 
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index 78f4f253f..dff82cef1 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmatroska
 pkgver=1.3.0
 pkgrel=2
 pkgdesc="Matroska library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
diff --git a/extra/libmcrypt/PKGBUILD b/extra/libmcrypt/PKGBUILD
index aae45867e..2f1b20aa7 100644
--- a/extra/libmcrypt/PKGBUILD
+++ b/extra/libmcrypt/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.5.8
 pkgrel=3
 pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms"
 url="http://mcrypt.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 options=('!libtool' '!emptydirs')
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index a84418dbb..dd1dd5d3b 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="A portable sound library"
 license=('GPL' 'LGPL')
 url="http://sourceforge.net/projects/mikmod/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 options=('!libtool')
 install=$pkgname.install
diff --git a/extra/libmms/PKGBUILD b/extra/libmms/PKGBUILD
index fd9ab3ea8..322a4fdd5 100644
--- a/extra/libmms/PKGBUILD
+++ b/extra/libmms/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmms
 pkgver=0.6.2
 pkgrel=1
 pkgdesc="MMS stream protocol library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/libmms/"
 license=(LGPL)
 depends=('glib2')
diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD
index 913603045..8e022137d 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmng
 pkgver=1.0.10
 pkgrel=4
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libmng.com/"
 license=('custom')
 depends=('zlib' 'libjpeg')
diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD
index ca27edda1..874946404 100644
--- a/extra/libmodplug/PKGBUILD
+++ b/extra/libmodplug/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libmodplug
 pkgver=0.8.8.3
 pkgrel=1
 pkgdesc="A MOD playing library"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://modplug-xmms.sourceforge.net/"
 license=('custom')
 depends=('gcc-libs')
diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD
index 7cce17917..7d4ca777a 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc='Performance and usability-oriented extensions to C'
 url='http://www.atheme.org/project/mowgli'
 license=('custom')
 depends=('glibc')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('403473582e3086c1acaafed59b9915f29a5d0ce0')
 
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index f374e413d..af01492ea 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=libmp3splt
 pkgver=0.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Library for splitting mp3 and ogg files without decoding"
 license=('GPL')
 url="http://mp3splt.sourceforge.net"
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index 79601b0be..997a491f5 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libmp4v2
 pkgver=1.9.1
 pkgrel=2
 pkgdesc="MPEG-4 library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MPL')
 url="http://code.google.com/p/mp4v2/"
 depends=('gcc-libs')
diff --git a/extra/libmpcdec/PKGBUILD b/extra/libmpcdec/PKGBUILD
index a8f30dbd7..de27d8451 100644
--- a/extra/libmpcdec/PKGBUILD
+++ b/extra/libmpcdec/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmpcdec
 pkgver=1.2.6
 pkgrel=3
 pkgdesc="Musepack decoding library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musepack.net/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD
index a268177c5..3ec83e29a 100644
--- a/extra/libmpd/PKGBUILD
+++ b/extra/libmpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmpd
 pkgver=11.8.17
 pkgrel=1
 pkgdesc="Signal based wrapper around libmpdclient"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
 license=('GPL')
 depends=('glib2')
diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD
index 277358431..fb6dc9072 100644
--- a/extra/libmpdclient/PKGBUILD
+++ b/extra/libmpdclient/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages'
 url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('39bdcf5399fb98e34b8b6110057b64f4d1945333')
diff --git a/extra/libmpeg2/PKGBUILD b/extra/libmpeg2/PKGBUILD
index 25960822d..192d24571 100644
--- a/extra/libmpeg2/PKGBUILD
+++ b/extra/libmpeg2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmpeg2
 pkgver=0.5.1
 pkgrel=3
 pkgdesc="Library for decoding MPEG-1 and MPEG-2 video streams."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libmpeg2.sourceforge.net/"
 depends=('glibc')
 makedepends=('sdl' 'libxv')
diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD
index 123b51c63..5d2d00ee5 100644
--- a/extra/libmsn/PKGBUILD
+++ b/extra/libmsn/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.2.1
 pkgrel=1
 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD
index faa38a667..c4391f5d0 100644
--- a/extra/libmspack/PKGBUILD
+++ b/extra/libmspack/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmspack
 pkgver=0.3alpha
 pkgrel=1
 pkgdesc="A library for Microsoft compression formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cabextract.org.uk/libmspack/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index 811b29c8f..2dd96a307 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmtp
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://libmtp.sourceforge.net"
 license=('LGPL')
 depends=('libusb-compat')
diff --git a/extra/libmusicbrainz3/PKGBUILD b/extra/libmusicbrainz3/PKGBUILD
index a89a5939a..1ac244274 100644
--- a/extra/libmusicbrainz3/PKGBUILD
+++ b/extra/libmusicbrainz3/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.0.3
 pkgrel=1
 pkgdesc="Library That Provides Access to the MusicBrainz Server  "
 url="http://musicbrainz.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=('neon' 'libdiscid')
 makedepends=('cmake')
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index 0acf293b5..682d26792 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmygpo-qt
 pkgver=1.0.5
 pkgrel=1
 pkgdesc="A C++/Qt client library for gpodder.net"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.gpodder.org/wiki/Libmygpo-qt"
 license=('LGPL2.1')
 depends=('qjson')
diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD
index e9debcd72..c5e5899da 100644
--- a/extra/libmythes/PKGBUILD
+++ b/extra/libmythes/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.2.2
 pkgrel=1
 epoch=1
 pkgdesc="a simple thesaurus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sourceforge.net/ "
 license=('custom')
 depends=('glibc' 'perl')
diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD
index 812ae9a4a..3bf7490a8 100644
--- a/extra/libnet/PKGBUILD
+++ b/extra/libnet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnet
 pkgver=1.1.5
 pkgrel=1
 pkgdesc="A library which provides API for commonly used low-level net functions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/libnet-dev/"
 license=('BSD')
 depends=('glibc' 'sh')
diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD
index 37d43bf7b..b0abc4d66 100644
--- a/extra/libnice/PKGBUILD
+++ b/extra/libnice/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnice
 pkgver=0.1.1
 pkgrel=1
 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nice.freedesktop.org"
 license=('LGPL')
 depends=('gstreamer0.10')
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index d82b64caf..cde614593 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnotify
 pkgver=0.7.4
 pkgrel=1
 pkgdesc="Desktop notification library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://library.gnome.org/devel/notification-spec/"
 license=('LGPL')
 depends=('gdk-pixbuf2')
diff --git a/extra/libnova/PKGBUILD b/extra/libnova/PKGBUILD
index 5074d4037..7824a8b06 100644
--- a/extra/libnova/PKGBUILD
+++ b/extra/libnova/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="libnova is a general purpose, double precision, celestial mechanics, astrometry and astrodynamics library."
 url="http://libnova.sourceforge.net/"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index 6031eb6ff..0f63f68c4 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=liboauth
 pkgver=0.9.6
 pkgrel=1
 pkgdesc='C library implementing OAuth Core RFC 5849'
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url='http://liboauth.sourceforge.net'
 license=('MIT')
 depends=('curl')
diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD
index 97905a1ea..b41468114 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libofa
 pkgver=0.9.3
 pkgrel=3
 pkgdesc="An open-source audio fingerprint by MusicIP"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://code.google.com/p/musicip-libofa/"
 license=('GPL2' 'custom')
 depends=('expat' 'curl' 'fftw' 'gcc-libs')
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index c2b414cf8..2d8983d95 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('libofx' 'libofx-doc')
 pkgver=0.9.4
 pkgrel=1
 pkgdesc="API for the OFX banking standard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libofx.sourceforge.net"
 license=('GPL')
 depends=('opensp' 'curl' 'libxml++')
diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD
index 35bfbfffc..13274421d 100644
--- a/extra/libogg/PKGBUILD
+++ b/extra/libogg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libogg
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="Ogg bitstream and framing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/ogg/"
 license=('BSD')
 depends=('glibc')
diff --git a/extra/liboil/PKGBUILD b/extra/liboil/PKGBUILD
index e206abb99..d227719e6 100644
--- a/extra/liboil/PKGBUILD
+++ b/extra/liboil/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liboil
 pkgver=0.3.17
 pkgrel=1
 pkgdesc="Library of simple functions that are optimized for various CPUs."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://liboil.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index 19099c355..ce429f367 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20100913
 pkgrel=6
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
 makedepends=('doxygen' 'qt' 'boost')
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index 85f758c52..64b708065 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.9.12
 pkgrel=1
 pkgdesc='OpenType Font library'
 url='http://www.m17n.org/libotf/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libxaw' 'freetype2')
 options=('!libtool')
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index 77e86cba1..853b2751e 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libotr
 pkgver=3.2.0
 pkgrel=2
 pkgdesc='Off-the-Record Messaging Library and Toolkit'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
 depends=('libgcrypt')
diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD
index cd749e574..1caa0736a 100644
--- a/extra/libots/PKGBUILD
+++ b/extra/libots/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libots
 pkgver=0.5.0
 pkgrel=2
 pkgdesc="Open Text Summarizer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libots.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'glib2')
diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD
index 472c52610..9d938f483 100644
--- a/extra/libpano13/PKGBUILD
+++ b/extra/libpano13/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libpano13
 pkgver=2.9.18
 pkgrel=1
 pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://panotools.sourceforge.net/"
 license=('GPL2')
 depends=('libpng' 'libtiff')
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index 8302ea92a..0ec358dd2 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpciaccess
 pkgver=0.12.1
 pkgrel=1
 pkgdesc="X11 PCI access library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 0b03fc544..5b5b2be1e 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpeas
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD
index 0121e951c..8032f5d86 100644
--- a/extra/libplist/PKGBUILD
+++ b/extra/libplist/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=libplist
 pkgver=1.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
 url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 depends=('glib2' 'libxml2' 'python2')
 makedepends=('cmake' 'swig')
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 531e9397e..45de74b8c 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.4.8
 _apngver=1.4.7
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
 depends=('zlib' 'sh')
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index 5b1367bd5..7c0b48819 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libproxy
 pkgver=0.4.7
 pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gcc-libs')
 optdepends=('kdelibs: KDE configuration module'
@@ -22,15 +22,17 @@ build() {
   cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
     -DCMAKE_SKIP_RPATH=ON \
     -DPERL_VENDORINSTALL=yes \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_WEBKIT=OFF \
+    -WITH_WEBKIT=OFF \
+    -WITH_MOZJS=OFF \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_C_FLAGS="${CFLAGS}"
+    -DCMAKE_C_FLAGS="${CFLAGS}" \
+    ../${pkgname}-${pkgver} 
   make
 }
 
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 835fdeb38..b9d706267 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
 pkgver=0.6.53
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost')
diff --git a/extra/libqalculate/PKGBUILD b/extra/libqalculate/PKGBUILD
index b9ffa1c21..d34fc9d6c 100644
--- a/extra/libqalculate/PKGBUILD
+++ b/extra/libqalculate/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libqalculate
 pkgver=0.9.7
 pkgrel=2
 pkgdesc="Multi-purpose desktop calculator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qalculate.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'cln' 'glib2' 'ncurses' 'readline')
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index a2690d93f..c2aca401d 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.8.0
 pkgrel=1
 pkgdesc="A Qt interface to the Zeitgeist event tracking system"
 url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('qt')
 makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist')
diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD
index 786d0fc96..3f61231e3 100644
--- a/extra/libraw1394/PKGBUILD
+++ b/extra/libraw1394/PKGBUILD
@@ -5,13 +5,13 @@
 pkgname=libraw1394
 pkgver=2.0.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
 depends=('glibc')
 makedepends=('pkgconfig')
 url="https://ieee1394.wiki.kernel.org/index.php/Main_Page"
-options=(!libtool force)
+options=(!libtool)
 source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.bz2)
 
 build() {
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 53a37e5c8..f9dea6764 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -10,55 +10,57 @@ pkgname=('libreoffice-common'
 	'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-typo')
+[ "${CARCH}" != "mips64el" ] && pkgname+=('libreoffice-sdk' \
+	'libreoffice-sdk-doc' \
+	'libreoffice-extension-diagram' \
+	'libreoffice-extension-google-docs' \
+	'libreoffice-extension-nlpsolver' \
+	'libreoffice-extension-presenter-screen' \
+	'libreoffice-extension-report-builder' \
+	'libreoffice-extension-scripting-beanshell' \
+	'libreoffice-extension-scripting-javascript' \
+	'libreoffice-extension-validator' \
+	'libreoffice-extension-watch-window' \
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.5.2
 pkgver=3.4.5
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #_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'
+             'sane' 'perl-archive-zip' 'zip' 'p7zip-libre' 'xulrunner' 'unixodbc' 'boost'
+             'gperf' 'poppler>=0.18.1' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
+             'vigra' 'libldap' 'libmythes' 'libwpg' 'imagemagick'
+             'gstreamer0.10-base'
               #'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' 
+             'pango' 'nspr' 'libjpeg' 'libxrandr' '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
 
+[ "${CARCH}" != "mips64el" ] && makedepends+=('hsqldb-java' 'apache-ant' 'beanshell' 'junit' 'mesa' 'java-environment' 'libgl' 'lucene')
+
 _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"
@@ -206,10 +208,15 @@ md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81'
 
 build() {
 
+    if [ "${CARCH}"  != "mips64el" ] ; then
 	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
+        extraconf="--enable-opengl --enable-ext-scripting-beanshell --with-system-lucene --with-ant-home=\"/usr/share/java/apache-ant\" --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 --enable-odk --enable-ext-diagram --enable-ext-google-docs --enable-ext-nlpsolver --enable-ext-report-builder --enable-ext-scripting-javascript --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher"
+    else
+        extraconf="--disable-opengl --without-java --without-system-lucene --without-system-hsqldb --without-system-beanshell --without-system-jfreereport --without-system-saxon --without-system-mesa-headers --without-junit"
+    fi
 
 	# move all LibO sources into one build directory
 	mkdir ${srcdir}/build && cd ${srcdir}/build
@@ -232,6 +239,8 @@ build() {
 	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
+        # Checks if --hash-style is accepted, not if --hash-style=both is accepted.
+        [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -264,7 +273,7 @@ build() {
 
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
-	./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+	./configure --with-build-version="${_LOver} Parabola GNU/Linux-libre build-${pkgrel}" --with-vendor="Parabola GNU/Linux-libre" \
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
 		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
@@ -286,27 +295,18 @@ build() {
 		--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\
@@ -318,7 +318,6 @@ build() {
 		--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\
@@ -326,7 +325,6 @@ build() {
 		--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\
@@ -335,10 +333,7 @@ build() {
 		--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 \
+		$extraconf \
 		$EXTRAOPTS || return 1
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
@@ -369,29 +364,30 @@ 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'
+          'pango' 'nspr' 'libjpeg' 'libxrandr' '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'
+ [ "${CARCH}" != "mips64el" ] && depends+=('libgl')
  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')
+ [ "${CARCH}" != "mips64el" ] && optdepends+=('java-runtime:     adds java support' \
+             'hsqldb-java:      default database format for OpenOffice.org' \
+             'beanshell:        interactive java -- good for prototyping /macros' \
+             'lucene:           full-text search engine library for Java needed in the help section')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf)
@@ -524,7 +520,7 @@ package_libreoffice-gnome() {
 package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
+ [ "${CARCH}" != "mips64el" ] && optdepends=('mesa:             for the OGLTrans extension')
  backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -606,7 +602,7 @@ package_libreoffice-sdk() {
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
  
- # fix ArchLinux LibreOffice installation paths	
+ # fix 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," \
diff --git a/extra/libreoffice/fix-nobody-temp-dir.patch b/extra/libreoffice/fix-nobody-temp-dir.patch
new file mode 100644
index 000000000..a36465c05
--- /dev/null
+++ b/extra/libreoffice/fix-nobody-temp-dir.patch
@@ -0,0 +1,11 @@
+--- bridges/source/cpp_uno/shared/vtablefactory.cxx.orig	2011-11-05 19:38:58.812005183 +0100
++++ bridges/source/cpp_uno/shared/vtablefactory.cxx	2011-11-05 19:40:01.654548478 +0100
+@@ -263,7 +263,7 @@
+ 
+     for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
+     {
+-        if (!strDirectory.getLength())
++        if (strDirectory.getLength() < 2)
+             strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" ));
+ 
+         strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" ));
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 77f71d413..42c12b653 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=librsvg
 pkgver=2.34.2
 pkgrel=1
 pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gdk-pixbuf2' 'pango' 'libcroco')
 makedepends=('intltool' 'gtk2')
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index d157dc5e1..20b70ea56 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libsamplerate
 pkgver=0.1.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/SRC/index.html"
 license=('GPL')
 depends=('libsndfile')
diff --git a/extra/libsexy/PKGBUILD b/extra/libsexy/PKGBUILD
index 86536f8b3..c507f0713 100644
--- a/extra/libsexy/PKGBUILD
+++ b/extra/libsexy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsexy
 pkgver=0.1.11
 pkgrel=3
 pkgdesc="Doing naughty things to good widgets."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://chipx86.com/wiki/Libsexy"
 depends=('gtk2' 'libxml2')
diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD
index 84d11dbad..decc80456 100644
--- a/extra/libshout/PKGBUILD
+++ b/extra/libshout/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.2.2
 pkgrel=4
 epoch=1
 pkgdesc="Library for accessing a shoutcast/icecast server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libvorbis' 'libtheora' 'speex')
 url="http://www.icecast.org/"
 options=('!libtool' '!emptydirs')
diff --git a/extra/libsidplay/PKGBUILD b/extra/libsidplay/PKGBUILD
index 4d1dfa791..5aa4368dc 100644
--- a/extra/libsidplay/PKGBUILD
+++ b/extra/libsidplay/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libsidplay
 pkgver=1.36.59
 pkgrel=4
 pkgdesc="A library for playing SID music files."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://critical.ch/distfiles/"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index 444460e89..52a249faa 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=libsigc++
 pkgname=('libsigc++' 'libsigc++-docs')
 pkgver=2.2.10
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2)
diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD
index 43a8267d0..030de8269 100644
--- a/extra/libsigsegv/PKGBUILD
+++ b/extra/libsigsegv/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libsigsegv
 pkgver=2.6
 pkgrel=2
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgdesc="Page fault detection library"
 url="http://libsigsegv.sourceforge.net/"
 license=('GPL2')
diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD
index 0abf5d86c..a68ea74a1 100644
--- a/extra/libsm/PKGBUILD
+++ b/extra/libsm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsm
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="X11 Session Management library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libice' 'util-linux-ng')
diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD
index 37f66af52..d13dd6dce 100644
--- a/extra/libsmbios/PKGBUILD
+++ b/extra/libsmbios/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libsmbios
 pkgver=2.2.28
 pkgrel=1
 pkgdesc="A library for providing access to as much BIOS information as possible"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://linux.dell.com/libsmbios/main/index.html"
 license=('GPL' 'custom')
 depends=('gcc-libs')
diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD
index b2c8cd0bb..3c8303ed8 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsndfile
 pkgver=1.0.25
 pkgrel=1
 pkgdesc="A C library for reading and writing files containing sampled sound"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/libsndfile"
 license=('LGPL')
 depends=('alsa-lib' 'flac' 'libvorbis')
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index d83ab37c2..4d85c1103 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libsocialweb
 pkgver=0.25.19
 pkgrel=2
 pkgdesc="A personal social data server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 745f90c09..353bc6673 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
 pkgver=2.36.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
 url="http://www.gnome.org"
diff --git a/extra/libspectre/PKGBUILD b/extra/libspectre/PKGBUILD
index bbef6cfbc..beac5f96b 100644
--- a/extra/libspectre/PKGBUILD
+++ b/extra/libspectre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libspectre
 pkgver=0.2.6
 pkgrel=2
 pkgdesc="Small library for rendering Postscript documents"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://libspectre.freedesktop.org/wiki/"
 depends=('ghostscript>=9.00')
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index a2dc1bfcd..4da9183cd 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
 source=("https://red.libssh.org/attachments/download/27/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD
index 3de174843..461240c0e 100644
--- a/extra/libstdc++5/PKGBUILD
+++ b/extra/libstdc++5/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libstdc++5
 pkgver=3.3.6
 pkgrel=4
 pkgdesc="GNU Standard C++ library version 3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gcc.gnu.org"
 license=('GPL' 'LGPL')
 depends=('gcc-libs')
diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 08f0a1dac..c81b0a90f 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libstroke
 pkgver=0.5.1
 pkgrel=5
 pkgdesc="A stroke (mouse gesture) translation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://etla.net/libstroke/"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index 2836a8ceb..8a72695ee 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libtasn1
 pkgver=2.9
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The ASN.1 library used in GNUTLS"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/libtasn1/"
 depends=('glibc' 'texinfo')
diff --git a/extra/libtextcat/PKGBUILD b/extra/libtextcat/PKGBUILD
index dfccfb8db..85e0e4459 100644
--- a/extra/libtextcat/PKGBUILD
+++ b/extra/libtextcat/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libtextcat
 pkgver=2.2
 pkgrel=8
 pkgdesc="Library that implements N-gram-based text categorization"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://software.wise-guys.nl/libtextcat/"
 license=('BSD')
 depends=('glibc')
diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD
index f61136bb1..cf684ed66 100644
--- a/extra/libthai/PKGBUILD
+++ b/extra/libthai/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.1.16
 pkgrel=1
 pkgdesc="Thai language support routines"
 url="http://linux.thai.net/projects/libthai"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libdatrie')
 makedepends=('pkgconfig')
diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD
index 89cdaecb7..d40c8a8d0 100644
--- a/extra/libtheora/PKGBUILD
+++ b/extra/libtheora/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libtheora
 pkgver=1.1.1
 pkgrel=2
 pkgdesc="An open video codec developed by the Xiph.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org"
 license=('BSD')
 depends=('libogg')
@@ -18,7 +18,7 @@ sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262')
 
 build() {
   cd "${srcdir}/libtheora-${pkgver}"
-  ./configure --prefix=/usr --enable-shared --disable-static
+  ./configure --prefix=/usr --enable-shared --disable-static --build=$CHOST --target=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index 1624b2a52..15a09199d 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libtiff
 pkgver=3.9.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Library for manipulation of TIFF images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/libtiff/"
 license=('custom')
 depends=('libjpeg' 'zlib')
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 9f7b84ac9..7974c9390 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.15.9
 pkgrel=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('boost-libs' 'python2')
 makedepends=('boost')
diff --git a/extra/libunique/PKGBUILD b/extra/libunique/PKGBUILD
index a3a50c67c..6beff607b 100644
--- a/extra/libunique/PKGBUILD
+++ b/extra/libunique/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libunique
 pkgver=1.1.6
 pkgrel=5
 pkgdesc="Library for writing single instance applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk2')
 makedepends=('gtk-doc' 'gobject-introspection')
diff --git a/extra/libunique3/PKGBUILD b/extra/libunique3/PKGBUILD
index cb9155eeb..f6a5549e4 100644
--- a/extra/libunique3/PKGBUILD
+++ b/extra/libunique3/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libunique3
 pkgver=3.0.2
 pkgrel=1
 pkgdesc="Library for writing single instance applications for GTK3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3')
 makedepends=('gtk-doc' 'gobject-introspection')
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 82623f37a..6bf68ba0f 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libupnp
 pkgver=1.6.14
 pkgrel=1
 pkgdesc="Portable Open Source UPnP Development Kit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pupnp.sourceforge.net/"
 license=('BSD')
 depends=('glibc')
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 33d8d6bc6..592f4a510 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libva
 pkgver=1.0.15
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
 depends=('libgl' 'libdrm' 'libxfixes')
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index bb012a83f..c23c73b79 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvdpau
 pkgver=0.4.1
 pkgrel=2
 pkgdesc="Nvidia VDPAU library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url='http://cgit.freedesktop.org/~aplattner/libvdpau'
 depends=('gcc-libs')
 conflicts=('nvidia-utils<190.42-2')
diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD
index 604b8788e..01c7c74d6 100644
--- a/extra/libvisual-plugins/PKGBUILD
+++ b/extra/libvisual-plugins/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvisual-plugins
 pkgver=0.4.0
 pkgrel=4
 pkgdesc="plugins for libvisual"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://www.localhost.nl/~synap/libvisual/"
 depends=('libvisual' 'gtk2' 'mesa' 'alsa-lib' 'jack')
diff --git a/extra/libvisual/PKGBUILD b/extra/libvisual/PKGBUILD
index 11b566762..4a5f8a0b0 100644
--- a/extra/libvisual/PKGBUILD
+++ b/extra/libvisual/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvisual
 pkgver=0.4.0
 pkgrel=3
 pkgdesc="Abstraction library that comes between applications and audio visualisation plugins"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/libvisual/"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index c473d2bca..5ce12bee4 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libvncserver
 pkgver=0.9.8.2
 pkgrel=1
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libvncserver.sourceforge.net/"
 license=('GPL')
 depends=('libjpeg' 'gnutls' 'libgcrypt')
diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD
index b144a90b1..2c7b35a34 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=libvorbis
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Vorbis codec library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.xiph.org/ogg/vorbis/"
 depends=('libogg')
@@ -18,7 +18,11 @@ md5sums=('c870b9bd5858a0ecb5275c14486d9554')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   #-march=i686 optimizes too much, strip it out
-  CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static
+  if [ "$CARCH" = "mips64el" ]; then
+  CFLAGS=${CFLAGS/loongson2f/mips3} ./configure --prefix=/usr --disable-static 
+  else
+  CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static 
+  fi
   make
 }
 
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index 5bab60077..fe6c58d41 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -5,23 +5,31 @@ pkgver=0.9.7.p1
 realver=0.9.7-p1
 pkgrel=1
 pkgdesc="The VP8 Codec SDK"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webmproject.org/"
 license=('BSD')
 depends=('glibc')
 makedepends=('yasm')
-source=(http://webm.googlecode.com/files/${pkgname}-v${realver}.tar.bz2)
-sha1sums=('dacfefaf3363f781de43858f09cdd0b0d469e6fc')
+source=(http://webm.googlecode.com/files/${pkgname}-v${realver}.tar.bz2
+        mips64el.patch)
+sha1sums=('dacfefaf3363f781de43858f09cdd0b0d469e6fc'
+          '4fd775826a4d737102f831c451235a58947f2cde')
 
 build() {
     cd "${srcdir}/${pkgname}-v${realver}"
+
+    if [ "$CARCH" = "mips64el" ]; then
+      extra="--target=mips64el-linux-gcc"
+      patch -Np1 -i ${srcdir}/mips64el.patch
+    fi
+
     ./configure --prefix=/usr --enable-vp8 \
         --enable-runtime-cpu-detect \
         --enable-shared \
         --enable-postproc \
         --enable-pic \
         --disable-install-docs \
-        --disable-install-srcs
+        --disable-install-srcs $extra
     make
 }
 
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
index 9cbac31f9..40985ac43 100644
--- a/extra/libwebkit/PKGBUILD
+++ b/extra/libwebkit/PKGBUILD
@@ -6,20 +6,33 @@ pkgname=(libwebkit libwebkit3)
 pkgver=1.6.1
 pkgrel=1
 pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
+checkdepends=('hspell')
 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')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
+        fix-mips-n32.patch)
+md5sums=('c11743694b1b71dad287b2e7a9e73b05'
+         '1e1971b0214f6705ceb4f816c4b52af9')
 
 build() {
   cd "${srcdir}/webkit-${pkgver}"
   mkdir build-gtk{2,3}
 
+  # WebKit knows only O32, not aligning memory on N32, also wants to
+  # use nonavailable JIT for all MIPS.
+  patch -Np1 -i "${srcdir}/fix-mips-n32.patch"
+
+  # ld needs more virtual memory than is available on MIPS n32, these
+  # options should reduce it.
+  if [ "${CARCH}" == "mips64el" ] ; then
+      export LDFLAGS="${LDFLAGS} -Wl,--reduce-memory-overhead -Wl,--no-keep-memory"
+  fi
+
   ( cd build-gtk2 && _build --with-gtk=2.0 )
   ( cd build-gtk3 && _build --with-gtk=3.0 )
 }
@@ -33,6 +46,12 @@ _build() {
   make all stamp-po
 }
 
+check() {
+  cd "${srcdir}/webkit-${pkgver}"
+  make -C build-gtk2 check
+  make -C build-gtk3 check
+}
+
 package_libwebkit() {
   pkgdesc+=" (for GTK2)"
   depends+=(gtk2)
diff --git a/extra/libwebkit/fix-mips-n32.patch b/extra/libwebkit/fix-mips-n32.patch
new file mode 100644
index 000000000..0acc0daf6
--- /dev/null
+++ b/extra/libwebkit/fix-mips-n32.patch
@@ -0,0 +1,25 @@
+--- webkit-1.4.1.orig/Source/JavaScriptCore/wtf/Platform.h	2011-06-30 12:14:01.572119909 +0200
++++ webkit-1.4.1/Source/JavaScriptCore/wtf/Platform.h	2011-06-30 12:17:00.352382262 +0200
+@@ -139,8 +139,9 @@
+ 
+ /* CPU(MIPS) - MIPS 32-bit */
+ /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now.  */
++/* N32 is also tested, without JIT. */
+ #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
+-    && defined(_ABIO32)
++  && (defined(_ABIO32) || defined(_ABIN32))
+ #define WTF_CPU_MIPS 1
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
+@@ -1009,9 +1010,9 @@
+ #define ENABLE_JIT 0
+ #endif
+ 
+-/* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */
++/* The JIT is enabled by default on all x86, x64-64, ARM & MIPS O32 platforms. */
+ #if !defined(ENABLE_JIT) \
+-    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
++    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || (CPU(MIPS) && defined(_ABIO32))) \
+     && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
+     && !OS(WINCE)
+ #define ENABLE_JIT 1
diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD
index 12061510c..06f31c7ff 100644
--- a/extra/libwmf/PKGBUILD
+++ b/extra/libwmf/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=8
+pkgrel=8.1
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wvware.sourceforge.net/libwmf.html"
 license=("LGPL")
 depends=('libpng' 'libx11' 'freetype2' 'libjpeg' 'gsfonts' 'expat')
diff --git a/extra/libwnck/PKGBUILD b/extra/libwnck/PKGBUILD
index e11df4304..48b4212dc 100644
--- a/extra/libwnck/PKGBUILD
+++ b/extra/libwnck/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libwnck
 pkgver=2.30.7
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk2' 'startup-notification' 'libxres')
 makedepends=('libxt' 'intltool' 'gobject-introspection')
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index ff006192b..e9e202629 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=libwnck
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'startup-notification' 'libxres')
 makedepends=('intltool' 'gobject-introspection')
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index b9032299c..30b22c16e 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwpd
 pkgver=0.9.2
 pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs')
diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD
index 5dfa3efca..45cb589d9 100644
--- a/extra/libwpg/PKGBUILD
+++ b/extra/libwpg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwpg
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpg.sourceforge.net/"
 license=('LGPL')
 depends=('libwpd>=0.9.0' 'perl')
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
index 650e94400..d99ebd4cc 100644
--- a/extra/libwps/PKGBUILD
+++ b/extra/libwps/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libwps
 pkgver=0.2.2
 pkgrel=1
 pkgdesc="a Microsoft Works file word processor format import filter library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libwps.sourceforge.net/"
 license=('LGPL')
 depends=('libwpd>=0.9.2')
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index da81d3904..f3194756d 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libx11
 pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('libxcb' 'xproto' 'kbproto')
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD
index f5301af1a..d0af40eb0 100644
--- a/extra/libxau/PKGBUILD
+++ b/extra/libxau/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxau
 pkgver=1.0.6
 pkgrel=1
 pkgdesc="X11 authorisation library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto>=7.0.18')
 makedepends=('pkgconfig')
diff --git a/extra/libxaw/PKGBUILD b/extra/libxaw/PKGBUILD
index d4f65c437..c62004a74 100644
--- a/extra/libxaw/PKGBUILD
+++ b/extra/libxaw/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxaw
 pkgver=1.0.9
 pkgrel=1
 pkgdesc="X11 Athena Widget library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxmu' 'libxpm')
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 31a5183f5..9696ea620 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxcb
 pkgver=1.7
 pkgrel=2
 pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xcb.freedesktop.org/"
 depends=('xcb-proto>=1.6' 'libxdmcp' 'libxau')
 makedepends=('pkgconfig' 'libxslt' 'python2')
diff --git a/extra/libxcomposite/PKGBUILD b/extra/libxcomposite/PKGBUILD
index 854af09b6..860c1e4f4 100644
--- a/extra/libxcomposite/PKGBUILD
+++ b/extra/libxcomposite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxcomposite
 pkgver=0.4.3
 pkgrel=1
 pkgdesc="X11 Composite extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes' 'compositeproto')
diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD
index 619024f09..aca6b0796 100644
--- a/extra/libxcursor/PKGBUILD
+++ b/extra/libxcursor/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxcursor
 pkgver=1.1.12
 pkgrel=1
 pkgdesc="X cursor management library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes' 'libxrender')
diff --git a/extra/libxdamage/PKGBUILD b/extra/libxdamage/PKGBUILD
index 231b4ce2d..f54fb1363 100644
--- a/extra/libxdamage/PKGBUILD
+++ b/extra/libxdamage/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxdamage
 pkgver=1.1.3
 pkgrel=1
 pkgdesc="X11 damaged region extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes>=4.0.4' 'damageproto>=1.2.0')
diff --git a/extra/libxdmcp/PKGBUILD b/extra/libxdmcp/PKGBUILD
index b247b9028..85b694ad7 100644
--- a/extra/libxdmcp/PKGBUILD
+++ b/extra/libxdmcp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxdmcp
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="X11 Display Manager Control Protocol library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xproto' 'glibc')
diff --git a/extra/libxevie/PKGBUILD b/extra/libxevie/PKGBUILD
index ac39bc680..69c6a9fe1 100644
--- a/extra/libxevie/PKGBUILD
+++ b/extra/libxevie/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxevie
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="X11 EvIE extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext')
diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD
index af85db2de..5d7bdd2f0 100644
--- a/extra/libxext/PKGBUILD
+++ b/extra/libxext/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxext
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="X11 miscellaneous extensions library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'xextproto')
diff --git a/extra/libxfce4menu/PKGBUILD b/extra/libxfce4menu/PKGBUILD
index b4dbbc21e..bfcd297e2 100644
--- a/extra/libxfce4menu/PKGBUILD
+++ b/extra/libxfce4menu/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libxfce4menu
 pkgver=4.6.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="a freedesktop.org compliant menu implementation for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 depends=("libxfce4util>=4.6.2")
diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD
index be1939c7b..069eb2ea6 100644
--- a/extra/libxfce4ui/PKGBUILD
+++ b/extra/libxfce4ui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxfce4ui
 pkgver=4.8.1
 pkgrel=1
 pkgdesc="Commonly used Xfce widgets among Xfce applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification')
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index ccfd512e8..f6cbca3aa 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libxfce4util
 pkgver=4.8.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Basic utility non-GUI functions for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 depends=('glib2')
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index b89360ae7..cd5e7168a 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libxfcegui4
 pkgver=4.8.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Various gtk widgets for Xfce"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' 'hicolor-icon-theme')
diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD
index d4e8ee97e..95c88ce88 100644
--- a/extra/libxfixes/PKGBUILD
+++ b/extra/libxfixes/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxfixes
 pkgver=5.0
 pkgrel=1
 pkgdesc="X11 miscellaneous 'fixes' extension library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'fixesproto>=5.0')
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 9d62d6835..2040b2742 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxfont
 pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index edcbf82e5..1ec28e76e 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxft
 pkgver=2.2.0
 pkgrel=1
 pkgdesc="FreeType-based font drawing library for X"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('fontconfig' 'libxrender')
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index b195dfce8..d500fb58a 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -5,17 +5,20 @@ pkgname=libxi
 pkgver=1.4.5
 pkgrel=1
 pkgdesc="X11 Input extension library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org"
 depends=('libxext' 'inputproto')
 makedepends=('pkgconfig' 'xorg-util-macros')
 options=(!libtool)
 license=('custom')
-source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737')
+source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2
+        XExtInt-align-classes-n32.diff)
+sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737'
+          '30931831efa9a7f8a888f41bb9284fa32f2e2392')
 
 build() {
   cd "${srcdir}/libXi-${pkgver}"
+  patch -Nup0 < "${srcdir}/XExtInt-align-classes-n32.diff"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
diff --git a/extra/libxi/XExtInt-align-classes-n32.diff b/extra/libxi/XExtInt-align-classes-n32.diff
new file mode 100644
index 000000000..dc5cc4db3
--- /dev/null
+++ b/extra/libxi/XExtInt-align-classes-n32.diff
@@ -0,0 +1,31 @@
+--- src/XExtInt.c.orig	2011-06-14 20:46:50.254164713 +0200
++++ src/XExtInt.c	2011-06-14 22:08:38.173047738 +0200
+@@ -1419,6 +1419,13 @@
+     for (i = 0; i < nclasses; i++)
+     {
+         int l = 0;
++#ifdef _ABIN32
++        /* On MIPS n32 doubles must be 8 byte aligned, but longs take
++           4 bytes, so next_block could make this structure
++           unaligned. */
++        if(len % 8 != 0)
++          len += 8 - len % 8;
++#endif
+         any_wire = (xXIAnyInfo*)ptr_wire;
+         switch(any_wire->type)
+         {
+@@ -1467,6 +1474,14 @@
+ 
+     for (i = 0; i < nclasses; i++)
+     {
++#ifdef _ABIN32
++      /* On MIPS n32 doubles must be 8 byte aligned, but longs take
++         4 bytes, so next_block could make this structure
++         unaligned. */
++      if(((size_t) ptr_lib) % 8 != 0)
++        ptr_lib += 8 - ((size_t) ptr_lib) % 8;
++#endif
++
+         any_lib = (XIAnyClassInfo*)ptr_lib;
+         any_wire = (xXIAnyInfo*)ptr_wire;
+ 
diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD
index 87801ba8c..53aba3ae1 100644
--- a/extra/libxinerama/PKGBUILD
+++ b/extra/libxinerama/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxinerama
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X11 Xinerama extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'xineramaproto')
diff --git a/extra/libxkbfile/PKGBUILD b/extra/libxkbfile/PKGBUILD
index 90e05db37..32c0d5adf 100644
--- a/extra/libxkbfile/PKGBUILD
+++ b/extra/libxkbfile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxkbfile
 pkgver=1.0.7
 pkgrel=1
 pkgdesc="X11 keyboard file manipulation library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libx11')
diff --git a/extra/libxkbui/PKGBUILD b/extra/libxkbui/PKGBUILD
index 78e39fe67..5b6d40daf 100644
--- a/extra/libxkbui/PKGBUILD
+++ b/extra/libxkbui/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxkbui
 pkgver=1.0.2
 pkgrel=3
 pkgdesc="X11 keyboard UI presentation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxt' 'libxkbfile')
diff --git a/extra/libxklavier/PKGBUILD b/extra/libxklavier/PKGBUILD
index 3539d795c..1779f53c5 100644
--- a/extra/libxklavier/PKGBUILD
+++ b/extra/libxklavier/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxklavier
 pkgver=5.1
 pkgrel=1
 pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
 makedepends=('pkgconfig')
diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD
index b7034d62a..e8cedeacf 100644
--- a/extra/libxmi/PKGBUILD
+++ b/extra/libxmi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxmi
 pkgver=1.2
 pkgrel=5
 pkgdesc="A library for rasterizing 2-D vector graphics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libxmi/libxmi.html"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index 198544cbb..6d4dc8db8 100644
--- a/extra/libxml++/PKGBUILD
+++ b/extra/libxml++/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libxml++
 pkgname=('libxml++' 'libxml++-docs')
 pkgver=2.34.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libxmlplusplus.sourceforge.net/"
 makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm')
diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD
index c5da2c5d2..987b3fa83 100644
--- a/extra/libxml2/PKGBUILD
+++ b/extra/libxml2/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libxml2
 pkgver=2.7.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="XML parsing library, version 2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7')
 makedepends=('python2')
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index 172af84ab..24374eb55 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxmu
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="X11 miscellaneous micro-utility library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'libxt')
 makedepends=('xorg-util-macros')
diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD
index fc3117259..1b6cfa728 100644
--- a/extra/libxp/PKGBUILD
+++ b/extra/libxp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxp
 pkgver=1.0.1
 pkgrel=2
 pkgdesc="X11 X Print Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'printproto')
diff --git a/extra/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD
index 676fd9e31..2b5734e3b 100644
--- a/extra/libxpm/PKGBUILD
+++ b/extra/libxpm/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=libxpm
 pkgver=3.5.9
-pkgrel=1
+pkgrel=1.1
 pkgdesc="X11 pixmap library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxt' 'libxext')
diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD
index 94a99d0b2..21f4de688 100644
--- a/extra/libxrandr/PKGBUILD
+++ b/extra/libxrandr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxrandr
 pkgver=1.3.2
 pkgrel=2
 pkgdesc="X11 RandR extension library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'libxrender' 'randrproto')
diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD
index bed1b410e..1ff10819b 100644
--- a/extra/libxrender/PKGBUILD
+++ b/extra/libxrender/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxrender
 pkgver=0.9.6
 pkgrel=1
 pkgdesc="X Rendering Extension client library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11>=1.3.4' 'renderproto')
diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD
index 8414f6745..2f3cdc8f8 100644
--- a/extra/libxres/PKGBUILD
+++ b/extra/libxres/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxres
 pkgver=1.0.5
 pkgrel=1
 pkgdesc="X11 Resource extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('libxext')
diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD
index c956c0f08..372d98220 100644
--- a/extra/libxslt/PKGBUILD
+++ b/extra/libxslt/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libxslt
 pkgver=1.1.26
-pkgrel=2
+pkgrel=2.1
 pkgdesc="XML stylesheet transformation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmlsoft.org/XSLT/"
 license=('custom')
 depends=('libxml2>=2.7.7' 'libgcrypt>=1.4.6')
diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD
index a6fbca454..c48afc968 100644
--- a/extra/libxss/PKGBUILD
+++ b/extra/libxss/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxss
 pkgver=1.2.1
 pkgrel=1
 pkgdesc="X11 Screen Saver extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'scrnsaverproto')
diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD
index 989e384c3..5676be5c2 100644
--- a/extra/libxt/PKGBUILD
+++ b/extra/libxt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxt
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X11 toolkit intrinsics library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libx11')
diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD
index bcdf92d29..adbb507e7 100644
--- a/extra/libxtst/PKGBUILD
+++ b/extra/libxtst/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxtst
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="X11 Testing -- Resource extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'libxi' 'recordproto' 'inputproto')
diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD
index a06c89882..17446b190 100644
--- a/extra/libxv/PKGBUILD
+++ b/extra/libxv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxv
 pkgver=1.0.6
 pkgrel=1
 pkgdesc="X11 Video extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'videoproto')
diff --git a/extra/libxvmc/PKGBUILD b/extra/libxvmc/PKGBUILD
index 3efb46c39..626ff5a95 100644
--- a/extra/libxvmc/PKGBUILD
+++ b/extra/libxvmc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxvmc
 pkgver=1.0.6
 pkgrel=1
 pkgdesc="X11 Video Motion Compensation extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxv>=1.0.5')
diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD
index c66ee69e5..09c80014b 100644
--- a/extra/libxxf86dga/PKGBUILD
+++ b/extra/libxxf86dga/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxxf86dga
 pkgver=1.1.2
 pkgrel=1
 pkgdesc="X11 Direct Graphics Access extension library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'xf86dgaproto')
diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD
index 12a6f3069..fb98a7fed 100644
--- a/extra/libxxf86vm/PKGBUILD
+++ b/extra/libxxf86vm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxxf86vm
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X11 XFree86 video mode extension library"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'xf86vidmodeproto')
diff --git a/extra/libytnef/PKGBUILD b/extra/libytnef/PKGBUILD
index 5516bb5ee..e8e6d0839 100644
--- a/extra/libytnef/PKGBUILD
+++ b/extra/libytnef/PKGBUILD
@@ -8,13 +8,16 @@ pkgrel=3
 pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
 url="http://freshmeat.net/projects/ytnef/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6c44b955f33cf714c75a7bbe895cc352')
 
 build() {
+  # Install updated config.guess and config.sub
+  cp "$srcdir/config.guess" "$srcdir/config.sub" "$srcdir/${pkgname}-${pkgver}"
+
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
   make
diff --git a/extra/libytnef/config.guess b/extra/libytnef/config.guess
new file mode 100755
index 000000000..f7dd69ecc
--- /dev/null
+++ b/extra/libytnef/config.guess
@@ -0,0 +1,1516 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-08-20'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/extra/libytnef/config.sub b/extra/libytnef/config.sub
new file mode 100755
index 000000000..0d2cddec7
--- /dev/null
+++ b/extra/libytnef/config.sub
@@ -0,0 +1,1766 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-09-09'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index d50b952db..5c485cce0 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives"
 url="http://www.nih.at/libzip/index.html"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 options=('!libtool')
 source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz"
diff --git a/extra/libzvt/PKGBUILD b/extra/libzvt/PKGBUILD
index 4c7c92cd0..02cac3521 100644
--- a/extra/libzvt/PKGBUILD
+++ b/extra/libzvt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libzvt
 pkgver=2.0.1
 pkgrel=6
 pkgdesc="Zed's virtual terminal library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 url="http://ftp.gnome.org/pub/GNOME/sources/libzvt"
 depends=('gtk2>=2.18.6' 'libart-lgpl>=2.3.20')
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 3eaf2461f..3b2767f66 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=licq
 pkgver=1.5.1
 pkgrel=1
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.licq.org"
 license=('GPL')
 depends=('libxss' 'qt' 'openssl')
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 6491559d8..ecc76df56 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.4.30
 pkgrel=2
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lighttpd.net/"
 depends=('pcre' 'bzip2' 'libldap' 'util-linux')
 makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index 2d30106bb..410fd6601 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=link-grammar
 pkgver=4.7.4
 pkgrel=2
 pkgdesc="A Grammar Checking library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.abisource.com/downloads/link-grammar/"
 license=('BSD')
 depends=('glibc')
diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD
index 30fab1149..7093d16f2 100644
--- a/extra/linux_logo/PKGBUILD
+++ b/extra/linux_logo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=linux_logo
 pkgver=5.11
 pkgrel=1
 pkgdesc="Text-based logo and system information program"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.deater.net/weave/vmwprod/linux_logo"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index e25f0ea94..1b7022396 100644
--- a/extra/liquidwar/PKGBUILD
+++ b/extra/liquidwar/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liquidwar
 pkgver=5.6.4
 pkgrel=6
 pkgdesc="A unique multiplayer wargame"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ufoot.org/liquidwar/"
 license=('GPL')
 depends=('allegro4')
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index e31812148..a5988a0d5 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -6,9 +6,9 @@ pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
 pkgrel=10
 epoch=1
-_extramodules=extramodules-3.2-ARCH
+_extramodules=extramodules-3.2-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index c44222970..5b2f948c1 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=live-media
 pkgver=2012.01.07
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
@@ -17,8 +17,8 @@ build() {
   cd ${srcdir}/live
 
    sed \
-       -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \
-       -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
+       -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. '"${CFLAGS}"' -fPIC -DSOCKLEN_T/g' \
+       -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) '"${LDFLAGS}"' -o/g' \
        -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
        -i config.linux
   ./genMakefiles linux
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index f954897da..2c2310b2d 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('libffi' 'python2' 'ocaml')
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index 9d6c1ff6e..d2ea6d729 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lm_sensors
 pkgver=3.3.1
 pkgrel=2
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/"
 license=('GPL' 'LGPL')
 depends=('perl' 'sysfsutils')
diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD
index d1686df56..17cbb2b01 100644
--- a/extra/loudmouth/PKGBUILD
+++ b/extra/loudmouth/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=loudmouth
 pkgver=1.4.3
 pkgrel=3
 pkgdesc="A lightweight Jabber client library written in C/Glib"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://groups.google.com/group/loudmouth-dev"
 depends=('glib2' 'gnutls' 'libidn')
diff --git a/extra/lpsolve/PKGBUILD b/extra/lpsolve/PKGBUILD
index d956a516f..3d70f3bf0 100644
--- a/extra/lpsolve/PKGBUILD
+++ b/extra/lpsolve/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.5.2.0
 _mainver=5.5
 pkgrel=1
 pkgdesc="a Mixed Integer Linear Programming (MILP) solver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lpsolve.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/lsdvd/PKGBUILD b/extra/lsdvd/PKGBUILD
index fbda54607..96dcb9eb1 100644
--- a/extra/lsdvd/PKGBUILD
+++ b/extra/lsdvd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lsdvd
 pkgver=0.16
 pkgrel=5
 pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lsdvd/"
 depends=('libdvdread')
 license=('GPL2')
diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD
index a8687fff1..44b249d78 100644
--- a/extra/lsof/PKGBUILD
+++ b/extra/lsof/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=lsof
 pkgver=4.85
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Lists open files for running Unix processes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://people.freebsd.org/~abe/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index 6101195a7..27d3518ac 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ltrace
 pkgver=0.6.0
 pkgrel=1
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ltrace.alioth.debian.org/"
 license=('GPL')
 depends=('elfutils')
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 2020b0270..65828bc12 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.1.4
 pkgrel=9
 _patchver=5.1.4-4
 pkgdesc="A powerful light-weight programming language designed for extending applications" 
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lua.org/"
 depends=('readline')
 license=('MIT')
@@ -26,6 +26,8 @@ build() {
   patch -p1 -i "${srcdir}/lua-arch.patch"
   [ "$CARCH" == "x86_64" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
   [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
+  [ "$CARCH" == "mips64el" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
+  [ "$CARCH" == "mips64el" ] && export CFLAGS="$CFLAGS -fPIC"
   make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     linux
diff --git a/extra/lxsplit/PKGBUILD b/extra/lxsplit/PKGBUILD
index 86d8a1a11..85de80fd7 100644
--- a/extra/lxsplit/PKGBUILD
+++ b/extra/lxsplit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lxsplit
 pkgver=0.2.4
 pkgrel=2
 pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lxsplit.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index 344bdfa54..0b24738ae 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -9,7 +9,7 @@ _pkgver=2-8-7
 pkgrel=4
 pkgdesc="A text browser for the World Wide Web"
 url="http://lynx.isc.org/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('ncurses' 'openssl')
 backup=('etc/lynx.cfg')
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index bc0e7856f..ddba16c90 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lyx
 pkgver=2.0.2
 pkgrel=1
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
 depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
 makedepends=('boost')
diff --git a/extra/lzo/PKGBUILD b/extra/lzo/PKGBUILD
index f93973dba..ec49ec493 100644
--- a/extra/lzo/PKGBUILD
+++ b/extra/lzo/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lzo
 pkgver=1.08
 pkgrel=6
 pkgdesc='A portable lossless data compression library written in ANSI C'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.oberhumer.com/opensource/lzo'
 depends=('glibc')
diff --git a/extra/lzop/PKGBUILD b/extra/lzop/PKGBUILD
index 240422d27..6ee369002 100644
--- a/extra/lzop/PKGBUILD
+++ b/extra/lzop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lzop
 pkgver=1.03
 pkgrel=1
 pkgdesc="File compressor using lzo lib"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.lzop.org/"
 depends=('lzo2')
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index 79f265f48..78a23f76a 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=m17n-lib
 pkgver=1.6.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Multilingual text processing library (runtimes)'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.m17n.org/m17n-lib/'
 license=('GPL')
 depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
diff --git a/extra/mahjong/PKGBUILD b/extra/mahjong/PKGBUILD
index 1b719f79d..82050d483 100644
--- a/extra/mahjong/PKGBUILD
+++ b/extra/mahjong/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mahjong
 pkgver=1.11
 pkgrel=1
 pkgdesc="The classical game of Mah Jong (not the solitare version) with network support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.stevens-bradfield.com/MahJong/"
 license=('GPL' 'custom')
 depends=('gtk2')
diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD
index b7789212a..4d68c6f0e 100644
--- a/extra/mail-notification/PKGBUILD
+++ b/extra/mail-notification/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mail-notification
 pkgver=5.4
 pkgrel=10
 pkgdesc="Tray icon application that informs you if you have new mail"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/mailnotify/"
 license=('GPL3' 'FDL')
 depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
diff --git a/extra/mailman/PKGBUILD b/extra/mailman/PKGBUILD
index 7306c6363..24a513b52 100644
--- a/extra/mailman/PKGBUILD
+++ b/extra/mailman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mailman
 pkgver=2.1.14
 pkgrel=1
 pkgdesc="Mailing list manager with built in web access"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.list.org/"
 depends=('python2' 'smtp-server')
diff --git a/extra/manedit/PKGBUILD b/extra/manedit/PKGBUILD
index 684357eea..fdd755c8f 100644
--- a/extra/manedit/PKGBUILD
+++ b/extra/manedit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=manedit
 pkgver=1.2.1
 pkgrel=4
 pkgdesc="An editor specifically tailored for UNIX manual pages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://freecode.com/projects/manedit"
 depends=('gcc-libs' 'bzip2' 'zlib' 'gtk')
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index 57dc50d44..b14b6b5af 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mash
 pkgver=0.1.0
 pkgrel=2
 pkgdesc="A small library for using 3D models within a Clutter scene"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index af30b54f4..8d63f8280 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -6,10 +6,14 @@ pkgname=maxima
 pkgver=5.25.1
 pkgrel=3
 pkgdesc="Maxima - a sophisticated computer algebra system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.54' 'texinfo' 'sh')
+if [ "${CARCH}" == "mips64el" ] ; then
+    depends=('clisp' 'texinfo' 'sh')
+else
+    depends=('sbcl=1.0.54' 'texinfo' 'sh')
+fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
@@ -26,8 +30,13 @@ build() {
   # set correct python executable to create docs
   sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
 
+  if [ "${CARCH}" == "mips64el" ] ; then
+      lisp="--enable-clisp --with-default-lisp=clisp"
+  else
+      lisp="--enable-sbcl --with-default-lisp=sbcl"
+  fi
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-	--libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
+	--libexecdir=/usr/lib $lisp
   make
 }
 
diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD
index 04a0e6223..1e05b23cb 100644
--- a/extra/mcpp/PKGBUILD
+++ b/extra/mcpp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mcpp
 pkgver=2.7.2
 pkgrel=3
 pkgdesc="Matsui's CPP implementation precisely conformed to standards"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://mcpp.sourceforge.net"
 depends=('glibc')
diff --git a/extra/mcrypt/PKGBUILD b/extra/mcrypt/PKGBUILD
index a3040ad3a..72b2bcc3d 100644
--- a/extra/mcrypt/PKGBUILD
+++ b/extra/mcrypt/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.6.8
 pkgrel=2
 pkgdesc="A program for encrypting files or streams"
 url="http://mcrypt.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('mhash' 'libmcrypt' 'zlib')
 source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 1f81cc302..87cb99e44 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mediastreamer
 pkgver=2.8.0
 pkgrel=1
 pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/"
 license=('GPL')
 depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index c706303b4..b6ffaebf5 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=memcached
 pkgver=1.4.11
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://memcached.org/"
 license=('GPL')
 depends=('libevent')
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 35bf8e8ed..5268abe7b 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mercurial
 pkgver=2.0.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mercurial.selenic.com/"
 license=('GPL')
 depends=('python2')
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index e1f0df20b..6264b49c4 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -4,6 +4,7 @@
 
 pkgbase=mesa
 pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
+[[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libglapi' 'libgl' 'libgles')
 # prepare 7.12/8.0
 #pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri')
 
@@ -18,9 +19,10 @@ if [ "${_git}" = "true" ]; then
     pkgver=7.11.2
 fi
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
+             'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
+[ "$CARCH" = "mips64el" ] || makedepends+=('dri2proto=2.6' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE)
@@ -33,12 +35,34 @@ if [ "${_git}" = "true" ]; then
 	#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
 )
 fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '0837c52698fe3252369c3fdb5195afcc')
+[ "$CARCH" = "mips64el" ] && \
+  source+=(mesa-7.5-mips-wmb.patch mesa-loongson.patch)
 
 build() {
     cd ${srcdir}/?esa-*
 
+
+if [ "$CARCH" = "mips64el" ]; then
+    # WMB for MIPS patch from Fedora and Gentoo
+    patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch
+    patch -Np1 -i $srcdir/mesa-loongson.patch
+
+      configure=configure
+    if [ ! -f configure ]; then
+      autoreconf -vfi
+      configure=autogen.sh 
+    fi
+
+    ./${configure} --prefix=/usr \
+    --enable-glx-tls \
+    --with-driver=xlib \
+    --enable-xcb \
+    --disable-glut \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-egl \
+    --disable-gallium-egl
+else
 if [ "${_git}" = "true" ]; then
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
@@ -75,6 +99,7 @@ if [ "${_git}" = "true" ]; then
     --enable-texture-float \
     --enable-shared-dricore
 fi
+fi
 
   make
 }
@@ -82,12 +107,15 @@ fi
 package_libgl() {
   depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
+  [[ "$CARCH" = "mips64el" ]] && pkgdesc="Mesa 3-D graphics library (Xlib)"
 
   cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib"
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
 
   bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
+
+  if [ "$CARCH" != "mips64el" ]; then
   bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
   bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
 
@@ -97,6 +125,8 @@ package_libgl() {
   ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
+  fi
+
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
 }
@@ -172,7 +202,8 @@ package_khrplatform-devel() {
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
+  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6')
+[ "$CARCH" = "mips64el" ] || depends+=('dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
@@ -301,3 +332,7 @@ package_nouveau-dri() {
 #    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 #fi
 #}
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+         '0837c52698fe3252369c3fdb5195afcc'
+         'c7788f2495060bf133771aef6ad25929'
+         '598c24dccfcdcc99c07d883f7c09f36a')
diff --git a/extra/mesa/mesa-7.5-mips-wmb.patch b/extra/mesa/mesa-7.5-mips-wmb.patch
new file mode 100644
index 000000000..06c3d1835
--- /dev/null
+++ b/extra/mesa/mesa-7.5-mips-wmb.patch
@@ -0,0 +1,11 @@
+--- mesa-20090921/src/mesa/drivers/dri/sis/sis_context.h.orig	2010-03-31 23:31:37.252554011 +0800
++++ mesa-20090921/src/mesa/drivers/dri/sis/sis_context.h	2010-03-31 23:32:06.616553941 +0800
+@@ -404,6 +404,8 @@
+ #define MMIO_WMB()	__asm __volatile("" : : : "memory")
+ #elif defined(__ia64__)
+ #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
++#elif defined(__mips__)
++#define MMIO_WMB()	__asm __volatile("" : : : "memory")
+ #else
+ #error platform needs WMB
+ #endif
diff --git a/extra/mesa/mesa-loongson.patch b/extra/mesa/mesa-loongson.patch
new file mode 100644
index 000000000..fa82abe49
--- /dev/null
+++ b/extra/mesa/mesa-loongson.patch
@@ -0,0 +1,11 @@
+--- Mesa-6.5.2/include/GL/internal/sarea.h.orig	2007-03-01 05:27:22.000000000 +0800
++++ Mesa-6.5.2/include/GL/internal/sarea.h	2007-03-01 05:27:49.000000000 +0800
+@@ -44,6 +44,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 			0x2000
++#elif defined(__mips__)
++#define SAREA_MAX                       0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000		/* 64kB */
+ #else
diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD
index 3d028d55b..12e0c3b39 100644
--- a/extra/metacity/PKGBUILD
+++ b/extra/metacity/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=metacity
 pkgver=2.34.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
 makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 1f9339602..ec87ecba0 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Metalog is a modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre')
 provides=('logger')
 backup=('etc/metalog.conf' 'etc/conf.d/metalog')
diff --git a/extra/mhash/PKGBUILD b/extra/mhash/PKGBUILD
index 3c2f7b732..1fac0fedc 100644
--- a/extra/mhash/PKGBUILD
+++ b/extra/mhash/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mhash
 pkgver=0.9.9.9
 pkgrel=2
 pkgdesc="A thread-safe hash library which provides a uniform interface to hash algorithms (MD5, SHA1, HAVAL, etc)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mhash.sourceforge.net/"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 432e226e2..e8fd07bd8 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=midori
 pkgver=0.4.3
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 license=('LGPL2.1')
 install=midori.install
@@ -24,7 +24,7 @@ build() {
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
+  ./configure --prefix=/usr \
 	--enable-addons \
 	--disable-hildon \
 	--enable-unique \
diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD
index cf49521bb..bd0e7d0aa 100644
--- a/extra/minicom/PKGBUILD
+++ b/extra/minicom/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=minicom
 pkgver=2.6
 pkgrel=1
 pkgdesc="A serial communication program"
-arch=('i686'  'x86_64')
+arch=('i686'  'x86_64' 'mips64el')
 url="http://alioth.debian.org/projects/minicom/"
 license=('GPL')
 depends=('bash' 'ncurses')
diff --git a/extra/mirage/PKGBUILD b/extra/mirage/PKGBUILD
index c63d6eddc..633b00d3c 100644
--- a/extra/mirage/PKGBUILD
+++ b/extra/mirage/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="A simple GTK+ Image Viewer"
 url="http://mirageiv.berlios.de"
 license=("GPL")
 depends=('pygtk' 'desktop-file-utils')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://download.berlios.de/mirageiv/${pkgname}-${pkgver}.tar.gz)
 install=$pkgname.install
 md5sums=('dace5cf01e5e53317ba8be0f8a74f4bf')
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index e6df06f4e..5401bfc0a 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=miro
 pkgver=4.0.3
 pkgrel=2
 pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.getmiro.com"
 license=('GPL2')
 depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index f4a33c5cd..b881f3a30 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mjpegtools
 pkgver=2.0.0
 pkgrel=1
 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)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://mjpeg.sourceforge.net/"
 depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
@@ -16,7 +16,6 @@ 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')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index a888f813f..8b2ae6712 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=5.2.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 8215d4d59..b4e0c93ee 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -5,7 +5,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://moc.daper.net/"
 license=('GPL')
 depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
diff --git a/extra/mod_dnssd/PKGBUILD b/extra/mod_dnssd/PKGBUILD
index 52a6e65e5..02c0b82a6 100644
--- a/extra/mod_dnssd/PKGBUILD
+++ b/extra/mod_dnssd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mod_dnssd
 pkgver=0.6
 pkgrel=4
 pkgdesc="Zeroconf module for Apache2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/mod_dnssd"
 license=('APACHE')
 depends=('avahi' 'apache')
diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD
index 30eca4e61..b50af4b07 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=2.3.6
 pkgrel=1
 pkgdesc="A FastCGI module for Apache HTTP Server."
 license=('APACHE')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://httpd.apache.org/mod_fcgid/"
 depends=('apache')
 source=(http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz)
diff --git a/extra/mod_mono/PKGBUILD b/extra/mod_mono/PKGBUILD
index 21e944d19..d839902fe 100644
--- a/extra/mod_mono/PKGBUILD
+++ b/extra/mod_mono/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mod_mono
 pkgver=2.10
 pkgrel=1
 pkgdesc="The mono module to make ASP.NET running on top of apache"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('APACHE')
 depends=('apache>=2.2.11' 'xsp')
 url="http://www.go-mono.com"
diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD
index 0d257544b..703071b1c 100644
--- a/extra/mod_perl/PKGBUILD
+++ b/extra/mod_perl/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Apache module that embeds the Perl interpreter within the server"
 url="http://search.cpan.org/dist/${pkgname}/"
 depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
 license=('APACHE')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=(!emptydirs)
 source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz
        nolfs.patch)
diff --git a/extra/mod_wsgi/PKGBUILD b/extra/mod_wsgi/PKGBUILD
index 293fcc9d5..3579695e7 100644
--- a/extra/mod_wsgi/PKGBUILD
+++ b/extra/mod_wsgi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mod_wsgi
 pkgver=3.3
 pkgrel=2
 pkgdesc="Python WSGI adapter module for Apache"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modwsgi.org/"
 license=('APACHE')
 depends=('apache' 'python2')
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 8ac3539e5..bf6bc7c58 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -5,7 +5,7 @@ _realname=ModemManager
 pkgver=0.5
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 license=('GPL2')
 depends=('dbus-glib' 'udev' 'ppp')
diff --git a/extra/monica/PKGBUILD b/extra/monica/PKGBUILD
index b3783fd57..0615205f3 100644
--- a/extra/monica/PKGBUILD
+++ b/extra/monica/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=monica
 pkgver=3.7
 pkgrel=2
 pkgdesc="A monitor calibration tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pcbypaul.com/software/monica.html"
 license=('BSD')
 depends=('fltk' 'xorg-xgamma')
diff --git a/extra/mono-addins/PKGBUILD b/extra/mono-addins/PKGBUILD
index 75de85ba0..01044c51a 100644
--- a/extra/mono-addins/PKGBUILD
+++ b/extra/mono-addins/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mono-addins
 pkgver=0.6.2
 pkgrel=1
 pkgdesc="A generic framework for creating extensible applications and for creating libraries which extend those applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mono-project.com/Mono.Addins"
 license=('custom:MIT')
 depends=('gtk-sharp-2>=2.12.8' 'mono>=2.10.5')
diff --git a/extra/mono-basic/PKGBUILD b/extra/mono-basic/PKGBUILD
index 0ffd93c05..f7d780783 100644
--- a/extra/mono-basic/PKGBUILD
+++ b/extra/mono-basic/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mono-basic
 pkgver=2.10
 pkgrel=1
 pkgdesc="Mono Visual Basic.NET compiler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('mono>=2.10.1')
diff --git a/extra/mono-debugger/PKGBUILD b/extra/mono-debugger/PKGBUILD
index b9ba3b347..6c5e31f4b 100644
--- a/extra/mono-debugger/PKGBUILD
+++ b/extra/mono-debugger/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=mono-debugger
 pkgver=2.10
 pkgrel=1
 pkgdesc="The Mono Debugger"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('mono>=2.10.1')
diff --git a/extra/mono-tools/PKGBUILD b/extra/mono-tools/PKGBUILD
index a7dc49bf1..e1b29235a 100644
--- a/extra/mono-tools/PKGBUILD
+++ b/extra/mono-tools/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=mono-tools
 pkgver=2.10
 pkgrel=2
 pkgdesc="collection of testing and development tools for use with mono (including monodoc browser)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('libgnome-sharp' 'gtkhtml-sharp')
diff --git a/extra/mono-zeroconf/PKGBUILD b/extra/mono-zeroconf/PKGBUILD
index 6b0728b3f..3bd43a6ee 100644
--- a/extra/mono-zeroconf/PKGBUILD
+++ b/extra/mono-zeroconf/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A cross platform Zero Configuration Networking library for Mono and .NET."
 url="http://www.mono-project.com/Mono.Zeroconf"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('mono>=2.6' 'avahi')
 options=('!makeflags')
 source=(http://download.banshee-project.org/mono-zeroconf/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 9a83fc925..336f59ca1 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mono
 pkgver=2.10.8
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
 url="http://www.mono-project.com/"
 depends=('zlib' 'libgdiplus>=2.10' 'sh')
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index d72219365..89a1ccaac 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=monodevelop-debugger-gdb
 pkgver=2.8.5
 pkgrel=1
 pkgdesc="Mono Debugger support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://monodevelop.com"
 license=('GPL')
 depends=('monodevelop>=2.8.5' 'gdb')
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index 6d91e7d02..5eeb3031d 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=most
 pkgver=5.0.0a
 pkgrel=4
 pkgdesc="A terminal pager similar to 'more' and 'less'"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('slang')
 license=('GPL')
 url="http://www.jedsoft.org/most/index.html"
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 707fb70fa..0a65e8f60 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mousetweaks
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL3' 'FDL')
 depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'intltool')
diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD
index 3d03d5b62..1c86b70cb 100644
--- a/extra/mp3splt/PKGBUILD
+++ b/extra/mp3splt/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=mp3splt
 pkgver=2.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Comandline tool for splitting mp3 and ogg files without decoding"
 license=('GPL')
 url="http://mp3splt.sourceforge.net"
diff --git a/extra/mp3wrap/PKGBUILD b/extra/mp3wrap/PKGBUILD
index bb42cbb1c..64811aeda 100644
--- a/extra/mp3wrap/PKGBUILD
+++ b/extra/mp3wrap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mp3wrap
 pkgver=0.5
 pkgrel=3
 pkgdesc="Tool for wrapping mp3 files. A free independent alternative to AlbumWrap"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mp3wrap.sourceforge.net"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD
index 65575e75a..788ddcc88 100644
--- a/extra/mpc/PKGBUILD
+++ b/extra/mpc/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mpc
 pkgver=0.21
 pkgrel=1
 pkgdesc="Minimalist command line interface to MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mpd.wikia.com/wiki/Client:Mpc"
 license=('GPL2')
 depends=('libmpdclient')
diff --git a/extra/mpck/PKGBUILD b/extra/mpck/PKGBUILD
index 6d65bb0e2..aa701f30c 100644
--- a/extra/mpck/PKGBUILD
+++ b/extra/mpck/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.19
 pkgrel=2
 license=('GPL')
 pkgdesc="Reads MP3 files and tries to determine if they are correct"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://checkmate.gissen.nl/"
 depends=('glibc')
 source=("http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz")
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 4710dcecb..afe78dfe7 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mpd
 pkgver=0.16.6
 pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://mpd.wikia.com/wiki/Server"
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index d50d65ecd..bf1dfb258 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mpg123
 pkgver=1.13.4
 pkgrel=2
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/mpg123"
 license=('GPL2' 'LGPL2.1')
 depends=('libltdl' 'alsa-lib')
diff --git a/extra/mrtg/PKGBUILD b/extra/mrtg/PKGBUILD
index 50899f59b..b60143b19 100644
--- a/extra/mrtg/PKGBUILD
+++ b/extra/mrtg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mrtg
 pkgver=2.17.4
 pkgrel=1
 pkgdesc="Multi Router Traffic Grapher."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.oetiker.ch/mrtg/"
 license=('GPL')
 depends=('gd' 'perl')
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 9e9aaef60..b340e8367 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=msmtp
 pkgver=1.4.27
 pkgrel=1
 pkgdesc="A mini smtp client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 depends=('gnutls' 'libidn')
diff --git a/extra/mt-st/PKGBUILD b/extra/mt-st/PKGBUILD
index a0963606f..e68bac3eb 100644
--- a/extra/mt-st/PKGBUILD
+++ b/extra/mt-st/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mt-st
 pkgver=1.1
 pkgrel=3
 pkgdesc="Linux SCSI tape driver aware magnetic tape control"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.ibiblio.org/pub/linux/system/backup/"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD
index ade751f74..1276e8fa8 100644
--- a/extra/mtools/PKGBUILD
+++ b/extra/mtools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtools
 pkgver=4.0.17
 pkgrel=2
 pkgdesc="A collection of utilities to access MS-DOS disks"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/mtools/"
 license=('GPL')
 depends=('sh')
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index e07e9a946..8653eac60 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.82
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
 source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
diff --git a/extra/mtx/PKGBUILD b/extra/mtx/PKGBUILD
index 4b014ac72..491cc9686 100644
--- a/extra/mtx/PKGBUILD
+++ b/extra/mtx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtx
 pkgver=1.3.12
 pkgrel=2
 pkgdesc="Send robot commands to tape changer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mtx.opensource-sw.net/"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD
index aa356da64..e73c1a9ce 100644
--- a/extra/multitail/PKGBUILD
+++ b/extra/multitail/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=multitail
 pkgver=5.2.8
 pkgrel=1
 pkgdesc="Lets you view one or multiple files like the original tail program"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.vanheusden.com/multitail"
 depends=('ncurses')
diff --git a/extra/muparser/PKGBUILD b/extra/muparser/PKGBUILD
index 0ee617c87..8f80cc463 100644
--- a/extra/muparser/PKGBUILD
+++ b/extra/muparser/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=muparser
 pkgver=1.34
 pkgrel=2
 pkgdesc="A fast math parser library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://muparser.sourceforge.net/"
 depends=('gcc-libs')
 license=('custom')
diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD
index 398cf0f1a..c9ea377ae 100644
--- a/extra/musicbrainz/PKGBUILD
+++ b/extra/musicbrainz/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=musicbrainz
 pkgver=2.1.5
 pkgrel=4
 pkgdesc="The second generation incarnation of the CD Index"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musicbrainz.org/index.html"
 license=('LGPL')
 depends=('expat>=2.0')
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 9b97bf170..572e4d753 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
 backup=('etc/Muttrc')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 optdepends=('smtp-forwarder: to send mail')
 depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
 source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index a8521c886..b87704750 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mutter
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
 makedepends=('intltool' 'gnome-doc-utils')
diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD
index 076e102d3..9b6a803a0 100644
--- a/extra/mx/PKGBUILD
+++ b/extra/mx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mx
 pkgver=1.4.1
 pkgrel=1
 pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.clutter-project.org"
 license=('LGPL')
 depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification')
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 7d80d1028..cce458d42 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mysql-python
 pkgver=1.2.3
 pkgrel=2
 pkgdesc="MySQL support for Python"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://mysql-python.sourceforge.net/"
 license=('GPL2')
 depends=('python2' 'libmysqlclient')
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index bf58c75b4..47703294c 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.20
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
 makedepends=('cmake' 'openssl' 'zlib')
diff --git a/extra/naim/PKGBUILD b/extra/naim/PKGBUILD
index d09e33ed7..0c20326bf 100644
--- a/extra/naim/PKGBUILD
+++ b/extra/naim/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=naim
 pkgver=0.11.8.3.2
 pkgrel=2
 pkgdesc="An ncurses AOL Instant Messenger and IRC client."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://naim.n.ml.org"
 depends=('ncurses')
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 9085d5e61..68be83af0 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=nasm
 pkgname=('nasm' 'nasm-doc')
 pkgver=2.09.10
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nasm.us"
 license=('BSD')
 makedepends=('ghostscript')
diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD
index d75eb7848..400d4b3a6 100644
--- a/extra/nautilus-open-terminal/PKGBUILD
+++ b/extra/nautilus-open-terminal/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nautilus-open-terminal
 pkgver=0.19
 pkgrel=2
 pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
 license=('GPL')
 depends=('nautilus' 'gconf')
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index 059c58eda..f55150cab 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nautilus-sendto
 pkgver=3.0.1
 pkgrel=2
 pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://download.gnome.org/sources/nautilus-sendto/"
 license=('GPL')
 groups=('gnome-extra')
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index d8a2f7351..f66533aaa 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nautilus
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
 makedepends=('intltool' 'gobject-introspection')
diff --git a/extra/ncftp/PKGBUILD b/extra/ncftp/PKGBUILD
index 921f49e52..d91b35031 100644
--- a/extra/ncftp/PKGBUILD
+++ b/extra/ncftp/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=3.2.5
 pkgrel=1
 pkgdesc="A set of free application programs implementing FTP"
 url="http://www.ncftp.com/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('ncurses')
 source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.bz2")
@@ -32,3 +32,4 @@ package() {
   install -Dm644 doc/LICENSE.txt \
     ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
+md5sums=('b05c7a6d5269c04891f02f43d4312b30')
diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD
index 901e9f73f..c4b433f55 100644
--- a/extra/ncmpc/PKGBUILD
+++ b/extra/ncmpc/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ncmpc
 pkgver=0.19
 pkgrel=1
 pkgdesc="A ncurses (command line) interface for MPD"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://mpd.wikia.com/wiki/Client:Ncmpc"
 license=('GPL')
 depends=('ncurses' 'glib2' 'libmpdclient')
diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD
index 250d5e2bd..dbf451fa8 100644
--- a/extra/nedit/PKGBUILD
+++ b/extra/nedit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nedit
 pkgver=5.5
 pkgrel=6
 pkgdesc="A Unix text editor for programmers and general users"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nedit.org/"
 license=('GPL')
 depends=('lesstif' 'libxpm')
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index 3732a7196..bd8df5b44 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=neon
 pkgver=0.29.6
 pkgrel=2
 pkgdesc="HTTP and WebDAV client library with a C interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('krb5' 'expat' 'ca-certificates')
 url="http://www.webdav.org/neon/"
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 910d86329..983f6e411 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=net-snmp
 pkgver=5.7.1
 pkgrel=1
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.net-snmp.org/"
 license=('BSD')
 depends=('openssl' 'libnl' 'pciutils')
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index 326e3483e..55439cfa9 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcdf
 pkgver=4.1.3
 pkgrel=1
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
 depends=('gcc-libs' 'hdf5' 'gcc-fortran' 'curl')
 options=('!libtool' '!makeflags')
diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD
index 39ee4889b..5311af1c9 100644
--- a/extra/netkit-bsd-finger/PKGBUILD
+++ b/extra/netkit-bsd-finger/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netkit-bsd-finger
 pkgver=0.17
 pkgrel=6
 pkgdesc="BSD-finger ported to Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='ftp://ftp.uk.linux.org/pub/linux/Networking/netkit'
 license=('BSD')
 depends=('glibc' 'xinetd')
diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD
index 6b92f5ef5..3250a33a4 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=netpbm
 pkgver=10.47.24
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A toolkit for manipulation of graphic images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom' 'BSD' 'GPL' 'LGPL')
 url="http://netpbm.sourceforge.net/"
 depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
@@ -37,6 +37,7 @@ build() {
 
   cp config.mk.in  config.mk
   [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
+  [ "${CARCH}" = 'mips64el' ] && 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
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
index 2509d8bb0..be3ef6888 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=nettle
 pkgver=2.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A low-level cryptographic library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lysator.liu.se/~nisse/nettle/"
 license=('GPL2')
 install=$pkgname.install
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 3a719ec0e..e0e0b19d2 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=network-manager-applet
 pkgver=0.9.2.0
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes')
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 9a18dddc4..14ca124b2 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-openconnect
 pkgver=0.9.2.0
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf')
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 96053ed65..4a237161d 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-openvpn
 pkgver=0.9.2.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 9e79dccf1..35f071145 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-pptp
 pkgver=0.9.2.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index e69ef38ef..d992f7886 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-vpnc
 pkgver=0.9.2.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 4dd030d1d..cc0193e0b 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=networkmanager
 pkgver=0.9.2.0
 pkgrel=1
 pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index cd9c5a79b..839a9a9d1 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=neverball
 pkgver=1.5.4
 pkgrel=3
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://neverball.org/"
 license=('GPL')
 depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD
index c37ea7190..96cf743d5 100644
--- a/extra/nicotine/PKGBUILD
+++ b/extra/nicotine/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.16
 pkgrel=3
 pkgdesc="Soulseek music-sharing client, written in python"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('pygtk>=2.14.1' 'mutagen')
 conflicts=(nicotine-plus)
 replaces=(nicotine-plus)
diff --git a/extra/nitrogen/PKGBUILD b/extra/nitrogen/PKGBUILD
index 3a3ddac95..5b6df2daa 100644
--- a/extra/nitrogen/PKGBUILD
+++ b/extra/nitrogen/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nitrogen
 pkgver=1.5.2
 pkgrel=1
 pkgdesc="Background browser and setter for X windows"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.l3ib.org/nitrogen/"
 license=('GPL')
 depends=('gtkmm' 'hicolor-icon-theme' 'librsvg')
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index b79385d88..606fe34d5 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nmap
 pkgver=5.51
 pkgrel=1
 pkgdesc="A network exploration tool and security/port scanner"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nmap.org"
 license=('GPL')
 depends=('pcre' 'openssl' 'libpcap' 'lua')
diff --git a/extra/normalize/PKGBUILD b/extra/normalize/PKGBUILD
index 1657800d7..9fa1f7063 100644
--- a/extra/normalize/PKGBUILD
+++ b/extra/normalize/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=normalize
 pkgver=0.7.7
 pkgrel=5
 pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://normalize.nongnu.org"
 license=('GPL')
 depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD
index 71f5bfab8..e382d9c4e 100644
--- a/extra/notification-daemon/PKGBUILD
+++ b/extra/notification-daemon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=notification-daemon
 pkgver=0.7.3
 pkgrel=1
 pkgdesc="Notification daemon for the desktop notifications framework"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.galago-project.org/specs/notification/"
 depends=('gtk3' 'libcanberra')
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index f025b013f..2bdfb0ad0 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nspr
 pkgver=4.8.9
 pkgrel=2
 pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/nspr/"
 license=('MPL' 'GPL')
 depends=('glibc')
diff --git a/extra/nss-mdns/PKGBUILD b/extra/nss-mdns/PKGBUILD
index 643dac89f..fb75b698e 100644
--- a/extra/nss-mdns/PKGBUILD
+++ b/extra/nss-mdns/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nss-mdns
 pkgver=0.10
 pkgrel=3
 pkgdesc="glibc plugin providing host name resolution via mDNS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/nss-mdns/"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 0dd8f4f2d..b08a21be8 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nss
 pkgver=3.13.1
 pkgrel=2
 pkgdesc="Mozilla Network Security Services"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
 _nsprver=4.8.9
diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD
index 0a1f93d38..44e8df8d2 100644
--- a/extra/nss_ldap/PKGBUILD
+++ b/extra/nss_ldap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nss_ldap
 pkgver=265
 pkgrel=2
 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.padl.com/OSS/nss_ldap.html"
 license=('LGPL')
 depends=('libldap>=2.4.18' 'krb5')
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index d9968d181..b1706dde1 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('ntfs-3g' 'ntfsprogs')
 pkgver=2011.4.12
 pkgrel=1
 url="http://www.tuxera.com"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc' 'fuse')
 makedepends=('pkgconfig')
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 8da3f4178..4fddb0426 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'readline' 'libcap')
 makedepends=('perl-html-parser')
 backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index 6140cb6dc..5211c17d2 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=13
 pkgrel=2
 epoch=1
 pkgdesc="A network connectivity tracking library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://launchpad.net/ntrack/"
 license=('LGPL')
 depends=('qt' 'libnl' 'gcc-libs')
diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD
index 7ee8cac19..849dc3151 100644
--- a/extra/nx-common/PKGBUILD
+++ b/extra/nx-common/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nx-common
 pkgver=3.5.0
 pkgrel=2
 pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://nomachine.com/"
 depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash')
diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD
index de2ce2e34..85f3dfbda 100644
--- a/extra/nxserver/PKGBUILD
+++ b/extra/nxserver/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nxserver
 pkgver=3.5.0
 pkgrel=4
 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://nomachine.com/"
 license=('GPL')
 depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
@@ -89,4 +89,4 @@ package() {
   # nxcompext
   cd ${srcdir}/nxcompext 
   cp -a libXcompext.so* ${pkgdir}/opt/NX/lib
-}
\ No newline at end of file
+}
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
index 41737577b..ad388ef42 100644
--- a/extra/obex-data-server/PKGBUILD
+++ b/extra/obex-data-server/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=obex-data-server
 pkgver=0.4.6
 pkgrel=2
 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.muiline.com/obex-data-server"
 license=('GPL')
 depends=('dbus-glib' 'openobex' 'imagemagick')
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index 79f2b3abd..80e4fb4b1 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('obexd-client' 'obexd-server')
 pkgver=0.44
 pkgrel=1
 url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('glib2' 'openobex' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD
index 806d1a3f2..3c3426120 100644
--- a/extra/obexftp/PKGBUILD
+++ b/extra/obexftp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=obexftp
 pkgver=0.23
 pkgrel=5
 pkgdesc="A tool for transfer files to/from any OBEX enabled device"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
 license=('GPL')
 depends=('openobex' 'python2')
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 7ba798ba7..3606d7ba9 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -6,20 +6,26 @@ pkgname=('ocaml' 'ocaml-compiler-libs')
 pkgver=3.12.1
 pkgrel=3
 pkgdesc="A functional language with OO extensions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2' 'custom: QPL-1.0')
 url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz)
-md5sums=('814a047085f0f901ab7d8e3a4b7a9e65')
-options=('!makeflags' '!emptydirs')
+source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz
+        fix-caml_int64_float_of_bits-n32.patch)
+md5sums=('814a047085f0f901ab7d8e3a4b7a9e65'
+         'e2c8bc316efe40532c5b9d7f9a1d8d62')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch"
   ./configure -prefix /usr 
-  make world.opt
+  if [ "${CARCH}" == "mips64el" ] ; then
+      make world
+  else
+      make world.opt
+  fi
 }
 
 package_ocaml() {
diff --git a/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch b/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch
new file mode 100644
index 000000000..98755d30b
--- /dev/null
+++ b/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch
@@ -0,0 +1,12 @@
+--- ocaml-3.12.0.orig/byterun/ints.c	2011-06-25 18:03:21.548733206 +0200
++++ ocaml-3.12.0/byterun/ints.c	2011-06-25 22:34:17.304788306 +0200
+@@ -585,6 +585,9 @@
+   return caml_copy_int64(u.i);
+ }
+ 
++#ifdef _ABIN32
++__attribute__((optimize(0)))
++#endif
+ CAMLprim value caml_int64_float_of_bits(value vi)
+ {
+   union { double d; int64 i; int32 h[2]; } u;
diff --git a/extra/ocrad/PKGBUILD b/extra/ocrad/PKGBUILD
index 558a54992..e15c6087f 100644
--- a/extra/ocrad/PKGBUILD
+++ b/extra/ocrad/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ocrad
 pkgver=0.21
 pkgrel=2
 pkgdesc="An Optical Character Recognition program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ocrad/ocrad.html"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 992a398a6..8f94e064b 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=octave
 pkgver=3.4.3
 pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
 license=('GPL')
 depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD
index 3cf29cf07..1723113e8 100644
--- a/extra/ode/PKGBUILD
+++ b/extra/ode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ode
 pkgver=0.11.1
 pkgrel=2
 pkgdesc="An open source, high performance library for simulating rigid body dynamics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ode.org"
 license=('LGPL' 'BSD')
 depends=('gcc-libs' 'bash')
diff --git a/extra/ogle/PKGBUILD b/extra/ogle/PKGBUILD
index 240daa30b..fbd7846b5 100644
--- a/extra/ogle/PKGBUILD
+++ b/extra/ogle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ogle
 pkgver=0.9.2
 pkgrel=13
 pkgdesc="A simple DVD player for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dtek.chalmers.se/groups/dvd/"
 license=('GPL')
 depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv'
diff --git a/extra/ogmtools/PKGBUILD b/extra/ogmtools/PKGBUILD
index 680260b06..02612b558 100644
--- a/extra/ogmtools/PKGBUILD
+++ b/extra/ogmtools/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ogmtools
 pkgver=1.5
 pkgrel=4
 pkgdesc="Information, extraction or creation for OGG media streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bunkus.org/videotools/ogmtools"
 license=('GPL')
 depends=('libvorbis' 'libdvdread' 'gcc-libs')
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 3ae5df87d..5486f00ad 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=opal
 pkgver=3.10.2
 pkgrel=3
 pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.ekiga.org"
 license=('GPL')
 depends=('ptlib' 'libtheora' 'x264' 'speex')
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 0a3c8f1a2..338d11712 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openal
 pkgver=1.13
 pkgrel=2
 pkgdesc="A cross-platform 3D audio library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openal.org/"
 license=(LGPL)
 depends=(glibc)
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index 95e04efaa..078e83de1 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openbabel
 pkgver=2.3.1
 pkgrel=1
 pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openbabel.org/wiki/Main_Page"
 license=('GPL')
 depends=('gcc-libs' 'libxml2')
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index f794241d6..4b9bbf1f2 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.15
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
 depends=('libxml2' 'openssl' 'libproxy')
diff --git a/extra/opencore-amr/PKGBUILD b/extra/opencore-amr/PKGBUILD
index e4fe7b376..affd35652 100644
--- a/extra/opencore-amr/PKGBUILD
+++ b/extra/opencore-amr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=opencore-amr
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="Open source implementation of the Adaptive Multi Rate (AMR) speech codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
 url="http://opencore-amr.sourceforge.net/"
 depends=('gcc-libs')
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index b4265766c..f35339262 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.3.1_a
 _realver=2.3.1
 pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.willowgarage.com/"
 depends=('jasper' 'gstreamer0.10-base' 'openexr'
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index 3f4afa72e..9fe115aef 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.7.0
 pkgrel=1
 pkgdesc="An high dynamic-range image file format library"
 url="http://www.openexr.com/"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
 options=('!libtool')
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index a5c7d41c6..1b4168f99 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.9.15.1
 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')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gcc-libs')
 makedepends=('cmake' 'llvm' 'libpng')
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 79d5bba98..e5a02aea5 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -11,7 +11,7 @@ _openjdk_date=28_feb_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
 pkgrel=1
 url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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'
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index 6d8331004..0b30d5fc8 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -7,7 +7,7 @@ _pkgver=v1_4
 _revision=r697
 pkgrel=1
 pkgdesc="An open source JPEG 2000 codec"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('BSD')
 url="http://www.openjpeg.org"
 depends=('zlib')
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 4673b26a6..d86167dda 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -4,10 +4,12 @@ pkgname=openmpi
 pkgver=1.5.4
 pkgrel=2
 pkgdesc="High performance message passing library (MPI)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org"
 license=('custom')
 depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
+[ "$CARCH" = "mips64el" ] && \
+depends=('gcc-fortran' 'openssh' 'libtool' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
 source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
@@ -16,6 +18,26 @@ sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c')
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
 
+# Disable valgrind
+   if [ "$CARCH" = "mips64el" ]; then
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/${pkgname} \
+               --mandir=/usr/share/man \
+               --enable-mpi-f90 \
+               --libdir=/usr/lib/${pkgname} \
+               --with-threads=posix \
+               --enable-mpi-threads \
+               --enable-smp-locks \
+               --without-valgrind \
+               --enable-memchecker \
+               --enable-debug \
+               --enable-pretty-print-stacktrace \
+               --without-slurm \
+               --with-hwloc=external \
+               --with-libltdl=/usr \
+               FC=/usr/bin/gfortran \
+               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+   else
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --mandir=/usr/share/man \
@@ -32,6 +54,7 @@ build() {
                --with-libltdl=/usr \
                FC=/usr/bin/gfortran \
                LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+   fi
 
    make
 }
diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD
index 3c3363c0a..0ecce3008 100644
--- a/extra/openobex/PKGBUILD
+++ b/extra/openobex/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.5
 pkgrel=2
 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol"
 url="http://dev.zuckschwerdt.org/openobex/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('bluez' 'libusb-compat')
 options=('!libtool')
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index 9ba1f94ab..97e007cfd 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=openslp
 pkgver=1.2.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Open-source implementation of Service Location Protocol"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.openslp.org"
 license=('BSD')
 depends=('glibc' 'bash' 'openssl')
diff --git a/extra/opensp/PKGBUILD b/extra/opensp/PKGBUILD
index 0559cfe6e..893d507a8 100644
--- a/extra/opensp/PKGBUILD
+++ b/extra/opensp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=opensp
 pkgver=1.5.2
 pkgrel=2
 pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openjade.sourceforge.net/"
 license=('BSD')
 depends=('gcc-libs')
diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD
index 2bc5449c2..d069bf092 100644
--- a/extra/oprofile/PKGBUILD
+++ b/extra/oprofile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=oprofile
 pkgver=0.9.7
 pkgrel=3
 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oprofile.sourceforge.net"
 license=('GPL')
 depends=('popt' 'gcc-libs' 'zlib' 'sh')
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index a5914f3d1..dd599f8d4 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=orage
 pkgver=4.8.2
 pkgrel=1
 pkgdesc="A simple calendar application with reminders for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/projects/orage/"
 groups=('xfce4-goodies')
diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD
index e141d91a7..08e9ce2db 100644
--- a/extra/orbit2/PKGBUILD
+++ b/extra/orbit2/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=orbit2
 pkgver=2.14.19
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Thin/fast CORBA ORB"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 depends=('libidl2>=0.8.11')
 makedepends=('pkgconfig')
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index bddf53c9f..902cf3a98 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=orc
 pkgver=0.4.14
 pkgrel=1
 pkgdesc="The Oild Runtime Compiler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://code.entropywave.com/projects/orc/"
 depends=('glibc')
diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index 714abfcc5..1fde192fd 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ortp
 pkgver=0.18.0
 pkgrel=1
 pkgdesc="A Real-time Transport Protocol (RTP) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng/code_review/ortp"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD
index 2b71ca3f9..6d2401833 100644
--- a/extra/ossp/PKGBUILD
+++ b/extra/ossp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ossp
 pkgver=1.3.2
 pkgrel=11
 pkgdesc="Emulate OSS device using CUSE"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/osspd"
 license=(GPL2)
 depends=('fuse>=2.8.0')
diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD
index 4736fcceb..0631dc875 100644
--- a/extra/oxine/PKGBUILD
+++ b/extra/oxine/PKGBUILD
@@ -7,7 +7,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oxine.sourceforge.net/"
 license=('GPL')
 depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst')
diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
index a2d4acf03..c499cd651 100644
--- a/extra/oxygen-gtk/PKGBUILD
+++ b/extra/oxygen-gtk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=oxygen-gtk
 pkgver=1.1.6
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-look.org/content/show.php/?content=136216"
 license=('LGPL')
 depends=('gtk2')
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index af0d4d0e9..af7957d73 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=p11-kit
 pkgver=0.9
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
 depends=(glibc)
diff --git a/extra/pam_ldap/PKGBUILD b/extra/pam_ldap/PKGBUILD
index b3418220a..8b1218e70 100644
--- a/extra/pam_ldap/PKGBUILD
+++ b/extra/pam_ldap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pam_ldap
 pkgver=185
 pkgrel=1
 pkgdesc="LDAP authentication module for the PAM framework"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.padl.com/OSS/pam_ldap.html"
 license=('LGPL')
 depends=('libldap>=2.4.22' 'pam')
diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD
index e0c903a57..5ffe03a44 100644
--- a/extra/pango-perl/PKGBUILD
+++ b/extra/pango-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pango-perl
 pkgver=1.223
 pkgrel=1
 pkgdesc="Perl bindings for Pango"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 5366a6574..f4200f93f 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=pango
 pkgver=1.29.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2')
 makedepends=('gobject-introspection' 'libxt' 'gtk-doc')
diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD
index 3699ffa68..ffa00e5d3 100644
--- a/extra/pangomm/PKGBUILD
+++ b/extra/pangomm/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=pangomm
 pkgname=('pangomm' 'pangomm-docs')
 pkgver=2.28.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD
index 6be68601b..998eefa60 100644
--- a/extra/paprefs/PKGBUILD
+++ b/extra/paprefs/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=paprefs
 pkgver=0.9.10
 pkgrel=2
 pkgdesc="A simple GTK-based configuration dialog for PulseAudio"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://0pointer.de/lennart/projects/paprefs"
 license=(GPL)
 depends=(gconfmm gnome-icon-theme libglademm libsigc++ pulseaudio)
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index 6b32478c2..9b5699e24 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=parted
 pkgver=3.0
 pkgrel=4
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/parted/parted.html"
 depends=('device-mapper' 'e2fsprogs')
diff --git a/extra/pathological/PKGBUILD b/extra/pathological/PKGBUILD
index cdc1bd856..d9fdbbff9 100644
--- a/extra/pathological/PKGBUILD
+++ b/extra/pathological/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pathological
 pkgver=1.1.3
 pkgrel=6
 pkgdesc="A puzzle game with the same feel as frozen bubble"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pathological.sourceforge.net/"
 license=('GPL')
 depends=('python-pygame')
diff --git a/extra/pavucontrol/PKGBUILD b/extra/pavucontrol/PKGBUILD
index b2a9bf1fb..0cae59a3f 100644
--- a/extra/pavucontrol/PKGBUILD
+++ b/extra/pavucontrol/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pavucontrol
 pkgver=1.0
 pkgrel=1
 pkgdesc="A GTK volume control tool for PulseAudio"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://0pointer.de/lennart/projects/pavucontrol"
 license=(GPL)
 depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
diff --git a/extra/pdksh/PKGBUILD b/extra/pdksh/PKGBUILD
index 388952747..6e73d7e3b 100644
--- a/extra/pdksh/PKGBUILD
+++ b/extra/pdksh/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pdksh
 pkgver=5.2.14
 pkgrel=6
 pkgdesc="A public domain clone of the AT&T Korn shell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.mun.ca/~michael/pdksh/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/pdns-recursor/PKGBUILD b/extra/pdns-recursor/PKGBUILD
index c344995ac..72d354b9d 100644
--- a/extra/pdns-recursor/PKGBUILD
+++ b/extra/pdns-recursor/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="PowerDNS recursor"
 url="http://www.powerdns.com"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs>=4.5.2' 'lua')
 makedepends=('boost')
 #options=(!makeflags)
diff --git a/extra/pdns/PKGBUILD b/extra/pdns/PKGBUILD
index 9506deee3..f59ea8a3a 100644
--- a/extra/pdns/PKGBUILD
+++ b/extra/pdns/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pdns
 pkgver=2.9.22
 pkgrel=7
 pkgdesc="A modern, advanced and high performance authoritative-only nameserver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.powerdns.com"
 license=('GPL')
 depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 'libldap')
diff --git a/extra/pekwm/PKGBUILD b/extra/pekwm/PKGBUILD
index bfcdb908d..589857269 100644
--- a/extra/pekwm/PKGBUILD
+++ b/extra/pekwm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pekwm
 pkgver=0.1.13
 pkgrel=1
 pkgdesc="A small, fast, functional, and flexible window manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://pekwm.org/"
 depends=('gcc-libs' 'libjpeg>=7' 'libpng' 'libxft' 'libxinerama' 'libxpm'
diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD
index 1fe3bd4c6..971a38206 100644
--- a/extra/perl-alien-sdl/PKGBUILD
+++ b/extra/perl-alien-sdl/PKGBUILD
@@ -11,7 +11,7 @@ _realname=Alien-SDL
 pkgver=1.430
 pkgrel=1
 pkgdesc="Building, finding and using SDL binaries"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(PerlArtistic GPL)
 url="http://search.cpan.org/dist/Alien-SDL/"
 depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD
index ebdc0719d..39a4cf8fa 100644
--- a/extra/perl-bit-vector/PKGBUILD
+++ b/extra/perl-bit-vector/PKGBUILD
@@ -7,7 +7,7 @@ _cpanname=Bit-Vector
 pkgver=7.1
 pkgrel=3
 pkgdesc='Efficient bit vector, set of integers and "big int" math library'
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_cpanname}/"
 depends=('perl-carp-clan' 'perl>=5.10.0')
diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD
index fc142e677..04eb676bf 100644
--- a/extra/perl-compress-bzip2/PKGBUILD
+++ b/extra/perl-compress-bzip2/PKGBUILD
@@ -5,7 +5,7 @@ _realname=Compress-Bzip2
 pkgver=2.09
 pkgrel=3
 pkgdesc="Interface to Bzip2 compression library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(GPL2)
 depends=(perl bzip2)
 url="http://search.cpan.org/dist/$_realname"
diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD
index 37f315f89..9b055e50c 100644
--- a/extra/perl-crypt-ssleay/PKGBUILD
+++ b/extra/perl-crypt-ssleay/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-ssleay
 pkgver=0.58
 pkgrel=3
 pkgdesc="OpenSSL glue that provides LWP https support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Crypt-SSLeay"
 license=('GPL' 'PerlArtistic')
 depends=('openssl')
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index 5127dcbf7..eede2d91d 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -7,7 +7,7 @@ _realname=DBD-mysql
 pkgver=4.020
 pkgrel=2
 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0')
diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD
index 298cc2008..b09ab358f 100644
--- a/extra/perl-dbd-sqlite/PKGBUILD
+++ b/extra/perl-dbd-sqlite/PKGBUILD
@@ -7,7 +7,7 @@ _cpanname=DBD-SQLite
 pkgver=1.31
 pkgrel=2
 pkgdesc="Self-contained RDBMS in a DBI driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/${_cpanname}"
 license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.61' 'sqlite3')
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 42f7a5770..71111f93a 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -7,7 +7,7 @@ _realname=DBI
 pkgver=1.616
 pkgrel=2
 pkgdesc="Database independent interface for Perl"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.12.1')
diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD
index 40e9ae353..93d9a56da 100644
--- a/extra/perl-digest-nilsimsa/PKGBUILD
+++ b/extra/perl-digest-nilsimsa/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Digest-Nilsimsa
 pkgver=0.06
 pkgrel=7
 pkgdesc="Perl version of Nilsimsa code."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.10.0')
diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD
index eaae5e528..f6218022a 100644
--- a/extra/perl-digest-sha1/PKGBUILD
+++ b/extra/perl-digest-sha1/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Digest-SHA1
 pkgver=2.13
 pkgrel=2
 pkgdesc="Perl interface to the SHA-1 Algorithm"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.10.0')
diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD
index 29cf92abd..0c3ea8dd3 100644
--- a/extra/perl-ev/PKGBUILD
+++ b/extra/perl-ev/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-ev
 pkgver=4.03
 pkgrel=1
 pkgdesc="perl interface to libev, a high performance full-featured event loop"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(PerlArtistic GPL)
 options=(!emptydirs)
 depends=('perl-common-sense')
diff --git a/extra/perl-event/PKGBUILD b/extra/perl-event/PKGBUILD
index 47d2ee055..de05e0f6d 100644
--- a/extra/perl-event/PKGBUILD
+++ b/extra/perl-event/PKGBUILD
@@ -8,7 +8,7 @@ _srcname=Event
 pkgver=1.20
 pkgrel=1
 pkgdesc="Framework for GUI events"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
 url="http://search.cpan.org/dist/${_srcname}/"
 depends=('perl')
diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD
index 53fc43f5e..dc2ce8ea5 100644
--- a/extra/perl-fcgi/PKGBUILD
+++ b/extra/perl-fcgi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-fcgi
 pkgver=0.74
 pkgrel=2
 pkgdesc="Fast CGI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/FCGI"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD
index 7e3b0a701..6d43f820d 100644
--- a/extra/perl-html-parser/PKGBUILD
+++ b/extra/perl-html-parser/PKGBUILD
@@ -8,7 +8,7 @@ _realname=HTML-Parser
 pkgver=3.68
 pkgrel=2
 pkgdesc="Perl HTML parser class"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl-html-tagset' 'perl>=5.12.1')
diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD
index af266d871..e7061cdba 100644
--- a/extra/perl-libintl-perl/PKGBUILD
+++ b/extra/perl-libintl-perl/PKGBUILD
@@ -7,7 +7,7 @@ _realname=libintl-perl
 pkgver=1.20
 pkgrel=3
 pkgdesc="Perl Module: Localization support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('gettext' 'perl>=5.10.0')
diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD
index 2926a9ec7..a609c7a9f 100644
--- a/extra/perl-locale-gettext/PKGBUILD
+++ b/extra/perl-locale-gettext/PKGBUILD
@@ -8,7 +8,7 @@ _realname=gettext
 pkgver=1.05
 pkgrel=8
 pkgdesc="Permits access from Perl to the gettext() family of functions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('gettext' 'perl')
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index 1a4f7c0cc..b676b2524 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Net-DNS
 pkgver=0.66
 pkgrel=4
 pkgdesc="Perl Module: Interface to the DNS resolver."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl-digest-hmac' 'perl-net-ip' 'perl>=5.10.0')
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index a48807752..679c3a8d9 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -7,7 +7,7 @@ _cpanname=Net-SSLeay
 pkgver=1.42
 pkgrel=2
 pkgdesc="Perl extension for using OpenSSL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:BSD')
 url="http://search.cpan.org/dist/${_cpanname}/"
 depends=('perl' 'openssl')
diff --git a/extra/perl-net-upnp/PKGBUILD b/extra/perl-net-upnp/PKGBUILD
index 9d2945e27..40b1c769b 100644
--- a/extra/perl-net-upnp/PKGBUILD
+++ b/extra/perl-net-upnp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-net-upnp
 pkgver=1.4.2
 pkgrel=4
 pkgdesc="Perl Module UPnP"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/"
 license=('BSD' 'PerlArtistic')
 options=('!emptydirs')
diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD
index 859379449..1008137cc 100644
--- a/extra/perl-netaddr-ip/PKGBUILD
+++ b/extra/perl-netaddr-ip/PKGBUILD
@@ -8,7 +8,7 @@ _realname=NetAddr-IP
 pkgver=4.058
 pkgrel=1
 pkgdesc="Perl module to manage IP addresses and subnets"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic' 'GPL')
 depends=('perl')
 options=('!emptydirs')
diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD
index 29483fdc1..ba580e6ee 100644
--- a/extra/perl-sdl/PKGBUILD
+++ b/extra/perl-sdl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-sdl
 pkgver=2.531
 pkgrel=3
 pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(LGPL)
 url="http://sdl.perl.org"
 depends=(perl-alien-sdl perl-tie-simple
diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD
index d955edfdd..7e1d939cf 100644
--- a/extra/perl-template-toolkit/PKGBUILD
+++ b/extra/perl-template-toolkit/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Template-Toolkit
 pkgver=2.22
 pkgrel=4
 pkgdesc="Perl template processing system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl-appconfig' 'perl>=5.10.0')
diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD
index 25f9e397d..8b05c1357 100644
--- a/extra/perl-term-readkey/PKGBUILD
+++ b/extra/perl-term-readkey/PKGBUILD
@@ -8,7 +8,7 @@ _realname=TermReadKey
 pkgver=2.30.01
 pkgrel=4
 pkgdesc="Provides simple control over terminal driver modes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('perl>=5.10.0' 'glibc')
 url="http://search.cpan.org/~stsi/${_realname}/"
diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD
index acd6932e2..f53a5babb 100644
--- a/extra/perl-text-iconv/PKGBUILD
+++ b/extra/perl-text-iconv/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Text-Iconv
 pkgver=1.7
 pkgrel=6
 pkgdesc="Interface to iconv codeset conversion"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/${_realname}/"
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD
index 5cba2c5c0..9808e3bbd 100644
--- a/extra/perl-time-hires/PKGBUILD
+++ b/extra/perl-time-hires/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-time-hires
 pkgver=1.9724
 pkgrel=2
 pkgdesc="Perl module: high resolution time, sleep, and alarm"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/Time-HiRes/"
 depends=('perl')
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 51e4c5126..241d4705d 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -8,7 +8,7 @@ _cpanname=Tk
 pkgver=804.030
 pkgrel=1
 pkgdesc="A graphical user interface toolkit for Perl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/${_cpanname}"
 license=('PerlArtistic' 'GPL' 'custom')
 depends=('libpng' 'libjpeg' 'tk' 'perl')
diff --git a/extra/perl-unicode-string/PKGBUILD b/extra/perl-unicode-string/PKGBUILD
index c8bcd6c7a..d7589af10 100644
--- a/extra/perl-unicode-string/PKGBUILD
+++ b/extra/perl-unicode-string/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Unicode-String
 pkgver=2.09
 pkgrel=6
 pkgdesc="String of Unicode characters for perl (UCS2/UTF16)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.10.0')
diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD
index 021aa1b05..b059f5723 100644
--- a/extra/perl-xml-parser/PKGBUILD
+++ b/extra/perl-xml-parser/PKGBUILD
@@ -9,7 +9,7 @@ _realname=XML-Parser
 pkgver=2.41
 pkgrel=1
 pkgdesc="Expat-based XML parser module for perl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl' 'expat')
diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD
index c2ab5a4f8..e772c2bbb 100644
--- a/extra/perl-yaml-syck/PKGBUILD
+++ b/extra/perl-yaml-syck/PKGBUILD
@@ -7,7 +7,7 @@ _realname=YAML-Syck
 pkgver=1.17
 pkgrel=2
 pkgdesc="Fast, lightweight YAML loader and dumper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl>=5.10.0')
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index 203bfc867..18c3813c5 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=phonon-gstreamer
 pkgver=4.5.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://phonon.kde.org"
 pkgdesc="Phonon GStreamer backend"
 license=('LGPL')
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 990855949..941f3309b 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=phonon-vlc
 pkgver=0.4.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://phonon.kde.org"
 pkgdesc="Phonon VLC backend"
 license=('LGPL')
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index ac5f39602..3a7e1755d 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=phonon
 pkgver=4.6.0
 pkgrel=1
 epoch=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 019ef8e19..0d9027829 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=php-apc
 pkgver=3.1.9
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
 depends=('php')
diff --git a/extra/php-suhosin/PKGBUILD b/extra/php-suhosin/PKGBUILD
index 45adeb4ee..e28ea3c1d 100644
--- a/extra/php-suhosin/PKGBUILD
+++ b/extra/php-suhosin/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=php-suhosin
 pkgver=0.9.33
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='An advanced protection system for PHP installations'
 url='http://www.hardened-php.net/suhosin/'
 license='PHP'
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 7fe8d6ab4..63827e0ed 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=('php'
 pkgver=5.3.9
 _suhosinver=5.3.7-0.9.10
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
 makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD
index e6c9575c6..d32550c62 100644
--- a/extra/physfs/PKGBUILD
+++ b/extra/physfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=physfs
 pkgver=2.0.2
 pkgrel=2
 pkgdesc="A library to provide abstract access to various archives"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/physfs/"
 license=('ZLIB')
 depends=('zlib')
diff --git a/extra/pidgin-encryption/PKGBUILD b/extra/pidgin-encryption/PKGBUILD
index d48c99c56..7ed71bf5c 100644
--- a/extra/pidgin-encryption/PKGBUILD
+++ b/extra/pidgin-encryption/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pidgin-encryption
 pkgver=3.1
 pkgrel=1
 pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://pidgin-encrypt.sourceforge.net/"
 depends=('pidgin' 'nss')
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index b15b93d53..47f3f81a7 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
diff --git a/extra/pilot-link/PKGBUILD b/extra/pilot-link/PKGBUILD
index b9b8f20b4..a77ba5dbe 100644
--- a/extra/pilot-link/PKGBUILD
+++ b/extra/pilot-link/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pilot-link
 pkgver=0.12.5
 pkgrel=2
 pkgdesc="A suite of tools for connecting to PalmOS handheld devices"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('readline>=6.0' 'libpng>=1.4.0' 'libusb-compat' 'popt' 'bluez>=4.59')
 options=('!libtool')
diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD
index 6aecd3c33..b3e7e7852 100644
--- a/extra/pinentry/PKGBUILD
+++ b/extra/pinentry/PKGBUILD
@@ -4,7 +4,7 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnupg.org/aegypten2"
 depends=('ncurses' 'libcap>=2.16')
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index d956f7741..d86a432b7 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pixman
 pkgver=0.24.2
 pkgrel=1
 pkgdesc="Pixman library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('glibc')
@@ -16,6 +16,10 @@ sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+#  [ "$CARCH" = "mips64el" ] && {
+#    patch -Np1 -i $srcdir/pixman-loongson2f.patch
+#    autoreconf -i
+#  }
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/pixman/pixman-loongson2f.patch b/extra/pixman/pixman-loongson2f.patch
new file mode 100644
index 000000000..15e01cb6b
--- /dev/null
+++ b/extra/pixman/pixman-loongson2f.patch
@@ -0,0 +1,2745 @@
+diff -urN pixman//configure.ac Pixman.Loongson//configure.ac
+--- pixman//configure.ac	2010-12-25 18:46:00.018699000 +0800
++++ Pixman.Loongson//configure.ac	2010-12-25 18:39:15.298778000 +0800
+@@ -264,6 +264,43 @@
+ ])
+ 
+ dnl ===========================================================================
++dnl Check for Loongson SIMD
++
++have_loongson_intrinsics=no
++AC_MSG_CHECKING(whether to use Loongson SIMD intrinsics)
++
++AC_COMPILE_IFELSE([
++#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
++error "Need GCC >= 4.4 for Loongson SIMD compilation"
++#endif
++int main () {
++    /* Test with a loongson SIMD instruction. */
++	asm volatile ( ".set arch = loongson2f \n\t" "and \$f0, \$f0, \$f0 \n\t"  : : : "cc", "memory" );
++    return 0;
++}], have_loongson_intrinsics=yes)
++
++
++AC_ARG_ENABLE(loongson,
++   [AC_HELP_STRING([--disable-loongson],
++                   [disable Loongson fast paths])],
++   [enable_loongson=$enableval], [enable_loongson=auto])
++
++if test $enable_loongson = no ; then
++   have_loongson_intrinsics=disabled
++fi
++
++if test $have_loongson_intrinsics = yes ; then
++   AC_DEFINE(USE_LS, 1, [use Loongson compiler intrinsics])
++fi
++
++AC_MSG_RESULT($have_loongson_intrinsics)
++if test $enable_loongson = yes && test $have_loongson_intrinsics = no ; then
++   AC_MSG_ERROR([Loongson intrinsics not detected])
++fi
++
++AM_CONDITIONAL(USE_LS, test $have_loongson_intrinsics = yes)
++
++dnl ===========================================================================
+ dnl Check for MMX
+ 
+ if test "x$MMX_CFLAGS" = "x" ; then
+diff -urN pixman//pixman/Makefile.am Pixman.Loongson//pixman/Makefile.am
+--- pixman//pixman/Makefile.am	2010-12-25 18:46:00.025027000 +0800
++++ Pixman.Loongson//pixman/Makefile.am	2010-12-25 18:39:15.303599000 +0800
+@@ -55,6 +55,19 @@
+ 	pixman-combine.h.template solaris-hwcap.mapfile pixman-x64-mmx-emulation.h
+ CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-combine64.h
+ 
++# loongson code
++if USE_LS
++noinst_LTLIBRARIES += libpixman-ls.la
++libpixman_ls_la_SOURCES = \
++	pixman-ls.c
++libpixman_ls_la_CFLAGS = $(DEP_CFLAGS) $(LS_CFLAGS)
++libpixman_ls_la_LIBADD = $(DEP_LIBS)
++libpixman_1_la_LDFLAGS += $(LS_LDFLAGS)
++libpixman_1_la_LIBADD += libpixman-ls.la
++
++ASM_CFLAGS_ls=$(LS_CFLAGS)
++endif
++
+ # mmx code
+ if USE_MMX
+ noinst_LTLIBRARIES += libpixman-mmx.la
+diff -urN pixman//pixman/pixman-combine-ls.c Pixman.Loongson//pixman/pixman-combine-ls.c
+--- pixman//pixman/pixman-combine-ls.c	1970-01-01 08:00:00.000000000 +0800
++++ Pixman.Loongson//pixman/pixman-combine-ls.c	2010-12-25 18:39:15.344171000 +0800
+@@ -0,0 +1,911 @@
++static force_inline uint32_t
++combine (const uint32_t *src, const uint32_t *mask)
++{
++    uint32_t ssrc = *src;
++
++    if (mask)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f22) 
++		load8888r(%0,$f20) 
++		expand_alpha($f22,$f22)

++		pix_multiply($f20,$f22)

++		store8888r($f8,%0)
++		:"+r"(ssrc):"r"(*mask):clobber
++		);
++    }
++    return ssrc;
++}
++
++static void
++ls_combine_saturate_u (pixman_implementation_t *imp,
++                        pixman_op_t              op,
++                        uint32_t *               dest,
++                        const uint32_t *         src,
++                        const uint32_t *         mask,
++                        int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	uint32_t s = combine (src, mask);
++	uint32_t d = *dest;
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%1,$f22) 
++	load8888r(%0,$f20) 
++	:"+r"(d):"r"(s):clobber
++	);
++
++	uint32_t sa = s >> 24;
++	uint32_t da = ~d >> 24;
++
++	if (sa > da)
++	{
++		uint32_t dds =  DIV_UN8 (da, sa) << 24;
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f24)
++		pix_multiply($f22,$f24)
++		save_to($f22)
++		::"r"(dds):clobber
++		);
++	}
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	pix_add($f20,$f22) 
++	store8888r($f8,%0)
++	:"=r"(*dest)::clobber
++	);
++
++	++src;
++	++dest;
++	if (mask)
++	    mask++;
++    }
++}
++static void
++ls_combine_out_u (pixman_implementation_t *imp,
++                   pixman_op_t              op,
++                   uint32_t *               dest,
++                   const uint32_t *         src,
++                   const uint32_t *         mask,
++                   int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask) 
++	{
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f24)
++		negate($f24,$f24)
++		pix_multiply($f20,$f24)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++
++		mask++;
++	}else {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f24)
++		negate($f24,$f24)
++		pix_multiply($f20,$f24)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);		
++		
++	}
++	++dest;
++	++src;
++    }
++}
++
++static void
++ls_combine_out_reverse_u (pixman_implementation_t *imp,
++                           pixman_op_t              op,
++                           uint32_t *               dest,
++                           const uint32_t *         src,
++                           const uint32_t *         mask,
++                           int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask)
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f20)
++		negate($f20,$f20)
++		pix_multiply($f20,$f24)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++
++		mask++;
++	}else{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f20)
++		negate($f20,$f20)
++		pix_multiply($f20,$f24)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);	
++	}
++	++dest;
++	++src;
++
++    }
++}
++
++static void
++ls_combine_out_ca (pixman_implementation_t *imp,
++                    pixman_op_t              op,
++                    uint32_t *               dest,
++                    const uint32_t *         src,
++                    const uint32_t *         mask,
++                    int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f26)
++		negate($f26,$f26)
++		pix_multiply($f20,$f22)
++		save_to($f20) 
++		pix_multiply($f20,$f26)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
++
++static void
++ls_combine_out_reverse_ca (pixman_implementation_t *imp,
++                            pixman_op_t              op,
++                            uint32_t *               dest,
++                            const uint32_t *         src,
++                            const uint32_t *         mask,
++                            int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f28)
++		pix_multiply($f22,$f28)
++		save_to($f22) 
++		negate($f22,$f22)
++		pix_multiply($f24,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
++
++
++static void
++ls_combine_atop_u (pixman_implementation_t *imp,
++                    pixman_op_t              op,
++                    uint32_t *               dest,
++                    const uint32_t *         src,
++                    const uint32_t *         mask,
++                    int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask)
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26)
++		expand_alpha($f24,$f28)
++		negate($f26,$f26)
++		pix_add_mul($f20,$f28,$f24,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++
++		mask++;
++	}else {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26)
++		expand_alpha($f24,$f28)
++		negate($f26,$f26)
++		pix_add_mul($f20,$f28,$f24,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);
++	}
++	++dest;
++	++src;
++
++    }
++}
++
++static void
++ls_combine_atop_reverse_u (pixman_implementation_t *imp,
++                            pixman_op_t              op,
++                            uint32_t *               dest,
++                            const uint32_t *         src,
++                            const uint32_t *         mask,
++                            int                      width)
++{
++    const uint32_t *end;
++
++    end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask){
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26)
++		expand_alpha($f24,$f28)
++		negate($f28,$f28)
++		pix_add_mul($f20,$f28,$f24,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++		mask++;
++	}else{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26)
++		expand_alpha($f24,$f28)
++		negate($f28,$f28)
++		pix_add_mul($f20,$f28,$f24,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);	
++	}
++	++dest;
++	++src;
++    }
++}
++
++
++static void
++ls_combine_atop_ca (pixman_implementation_t *imp,
++                     pixman_op_t              op,
++                     uint32_t *               dest,
++                     const uint32_t *         src,
++                     const uint32_t *         mask,
++                     int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f26) 
++		expand_alpha($f20,$f28) 
++		pix_multiply($f20,$f22)
++		save_to($f20)
++		pix_multiply($f22,$f28)
++		save_to($f22)
++		negate($f22,$f22)
++		pix_add_mul($f24,$f22,$f20,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
++
++static void
++ls_combine_atop_reverse_ca (pixman_implementation_t *imp,
++                             pixman_op_t              op,
++                             uint32_t *               dest,
++                             const uint32_t *         src,
++                             const uint32_t *         mask,
++                             int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f26)
++		expand_alpha($f20,$f28)
++		pix_multiply($f20,$f22)
++		save_to($f20) 
++		pix_multiply($f22,$f28)
++		save_to($f22) 
++		negate($f26,$f26)
++		pix_add_mul($f24,$f22,$f20,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
++
++static void
++ls_combine_xor_u (pixman_implementation_t *imp,
++                   pixman_op_t              op,
++                   uint32_t *               dest,
++                   const uint32_t *         src,
++                   const uint32_t *         mask,
++                   int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask) 
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26) 
++		expand_alpha($f24,$f28) 
++		negate($f26,$f26)
++		negate($f28,$f28)
++		pix_add_mul($f20,$f28,$f24,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++		mask++;
++	}else{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26) 
++		expand_alpha($f24,$f28) 
++		negate($f26,$f26)
++		negate($f28,$f28)
++		pix_add_mul($f20,$f28,$f24,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);
++	}
++	++dest;
++	++src;
++
++    }
++}
++
++static void
++ls_combine_xor_ca (pixman_implementation_t *imp,
++                    pixman_op_t              op,
++                    uint32_t *               dest,
++                    const uint32_t *         src,
++                    const uint32_t *         mask,
++                    int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f26) 
++		expand_alpha($f20,$f28) 
++		pix_multiply($f20,$f22)
++		save_to($f20) 
++		pix_multiply($f22,$f28)
++		save_to($f22) 
++		negate($f26,$f26)
++		negate($f22,$f22)
++		pix_add_mul($f24,$f22,$f20,$f26)		
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
++
++
++static void
++ls_combine_in_reverse_u (pixman_implementation_t *imp,
++                          pixman_op_t              op,
++                          uint32_t *               dest,
++                          const uint32_t *         src,
++                          const uint32_t *         mask,
++                          int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++ 
++	if (mask) 
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26)
++		pix_multiply($f24,$f26)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++		mask++;
++	} else {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f26)
++		pix_multiply($f24,$f26)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber		
++		);
++	}
++	++dest;
++	++src;
++    }
++}
++
++static void
++ls_combine_in_reverse_ca (pixman_implementation_t *imp,
++                           pixman_op_t              op,
++                           uint32_t *               dest,
++                           const uint32_t *         src,
++                           const uint32_t *         mask,
++                           int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f20,$f20) 
++		pix_multiply($f22,$f20)
++		save_to($f26)
++		pix_multiply($f24,$f26)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
++
++static void
++ls_combine_in_u (pixman_implementation_t *imp,
++                  pixman_op_t              op,
++                  uint32_t *               dest,
++                  const uint32_t *         src,
++                  const uint32_t *         mask,
++                  int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask) 
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f24)
++		pix_multiply($f20,$f24)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++		mask++;
++	} else {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f24)
++		pix_multiply($f20,$f24)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);	
++	
++	}
++	++dest;
++	++src;
++    }
++}
++
++static void
++ls_combine_in_ca (pixman_implementation_t *imp,
++                   pixman_op_t              op,
++                   uint32_t *               dest,
++                   const uint32_t *         src,
++                   const uint32_t *         mask,
++                   int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		expand_alpha($f24,$f24) 
++		pix_multiply($f20,$f22)
++		save_to($f26)
++		pix_multiply($f26,$f24)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++ }
++static void
++ls_combine_src_ca (pixman_implementation_t *imp,
++                    pixman_op_t              op,
++                    uint32_t *               dest,
++                    const uint32_t *         src,
++                    const uint32_t *         mask,
++                    int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22) 
++		load8888r(%1,$f20) 
++		pix_multiply($f20,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++mask;
++	++dest;
++    }
++
++}
++
++
++static void 
++ls_combine_over_u (pixman_implementation_t *imp,
++                    pixman_op_t              op,
++                    uint32_t *               dest,
++                    const uint32_t *         src,
++                    const uint32_t *         mask,
++                    int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++
++	uint32_t ssrc = combine (src, mask);
++	uint32_t a = ssrc >> 24;
++
++	if (a == 0xff)
++	{
++	    *dest = ssrc;
++	}
++	else if (ssrc)
++	{
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20)
++
++		expand_alpha($f20,$f24) 
++		load8888r(%0,$f26) 
++		over($f20,$f24,$f26)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(ssrc):clobber
++		);
++	}
++
++	++dest;
++	++src;
++	if (mask)
++	    ++mask;
++    }
++}
++
++static void
++ls_combine_over_reverse_u (pixman_implementation_t *imp,
++                            pixman_op_t              op,
++                            uint32_t *               dest,
++                            const uint32_t *         src,
++                            const uint32_t *         mask,
++                            int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++	if (mask)
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f26) 
++		expand_alpha($f26,$f28)
++		over($f26,$f28,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++		mask++;
++	}else{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f26) 
++		expand_alpha($f26,$f28)
++		over($f26,$f28,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);	
++	
++	}
++	++dest;
++	++src;
++    }
++}
++
++
++static void
++ls_combine_over_ca (pixman_implementation_t *imp,
++                     pixman_op_t              op,
++                     uint32_t *               dest,
++                     const uint32_t *         src,
++                     const uint32_t *         mask,
++                     int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20) 
++		load8888r(%1,$f22) 
++		load8888r(%2,$f24) 
++		expand_alpha($f22,$f26) 
++		in_over($f22,$f26,$f24,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++
++}
++
++static void
++ls_combine_over_reverse_ca (pixman_implementation_t *imp,
++                             pixman_op_t              op,
++                             uint32_t *               dest,
++                             const uint32_t *         src,
++                             const uint32_t *         mask,
++                             int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20) 
++		load8888r(%1,$f22) 
++		load8888r(%2,$f24) 
++		in($f22,$f24)
++		save_to($f22)
++		expand_alpha($f20,$f28) 
++		over($f20,$f28,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++
++}
++
++static void
++ls_combine_add_u (pixman_implementation_t *imp,
++                   pixman_op_t              op,
++                   uint32_t *               dest,
++                   const uint32_t *         src,
++                   const uint32_t *         mask,
++                   int                      width)
++{
++    const uint32_t *end = dest + width;
++
++    while (dest < end)
++    {
++
++	if (mask)
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%2,$f22)  
++		load8888r(%1,$f20) 
++		expand_alpha($f22,$f22)
++		pix_multiply($f20,$f22)
++		save_to ($f20)
++
++		load8888r(%0,$f22) 
++		pix_add($f20,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++		mask++;
++	}else{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++
++		load8888r(%0,$f22) 
++		pix_add($f20,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src):clobber
++		);	
++	
++	}
++	++dest;
++	++src;
++    }
++}
++
++static void
++ls_combine_add_ca (pixman_implementation_t *imp,
++                    pixman_op_t              op,
++                    uint32_t *               dest,
++                    const uint32_t *         src,
++                    const uint32_t *         mask,
++                    int                      width)
++{
++    const uint32_t *end = src + width;
++
++    while (src < end)
++    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20) 
++		load8888r(%1,$f22) 
++		load8888r(%2,$f24) 
++		pix_multiply($f22,$f24)
++		save_to($f22)
++		pix_add($f22,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
++		);
++	++src;
++	++dest;
++	++mask;
++    }
++}
+diff -urN pixman//pixman/pixman-composite-ls.c Pixman.Loongson//pixman/pixman-composite-ls.c
+--- pixman//pixman/pixman-composite-ls.c	1970-01-01 08:00:00.000000000 +0800
++++ Pixman.Loongson//pixman/pixman-composite-ls.c	2010-12-25 18:39:15.356667000 +0800
+@@ -0,0 +1,967 @@
++static void
++ls_composite_over_x888_8_8888 (pixman_implementation_t *imp,
++                                 pixman_op_t              op,
++                                 pixman_image_t *         src_image,
++                                 pixman_image_t *         mask_image,
++                                 pixman_image_t *         dst_image,
++                                 int32_t                  src_x,
++                                 int32_t                  src_y,
++                                 int32_t                  mask_x,
++                                 int32_t                  mask_y,
++                                 int32_t                  dest_x,
++                                 int32_t                  dest_y,
++                                 int32_t                  width,
++                                 int32_t                  height)
++{
++
++    uint32_t    *src, *src_line;
++    uint32_t    *dst, *dst_line;
++    uint8_t     *mask, *mask_line;
++    int src_stride, mask_stride, dst_stride;
++    uint32_t m;
++    uint32_t s, d;
++    int32_t w;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++
++    while (height--)
++    {
++	src = src_line;
++	src_line += src_stride;
++	dst = dst_line;
++	dst_line += dst_stride;
++	mask = mask_line;
++	mask_line += mask_stride;
++
++	w = width;
++	while (w--)
++	{
++	    m = *mask++;
++	    if (m)
++	    {
++		s = *src | 0xff000000;
++
++		if (m == 0xff)
++		{
++		    *dst = s;
++		}
++		else
++		{
++          __asm__ volatile (
++          ".set arch=loongson2f \n\t"     
++          load8888r(%0,$f20) 
++          load8888r(%1,$f22) 
++          load8888r(%2,$f24) 
++          expand_alpha($f22,$f26)
++          expand_alpha_rev($f24,$f28)
++          in_over($f22,$f26,$f28,$f20)
++          store8888r($f8,%0)
++          :"+r"(*dst):"r"(s),"r"(m):clobber
++          );
++
++//		    __m64 sa = expand_alpha (s);
++//		    __m64 vm = expand_alpha_rev (to_m64 (m));
++//		    __m64 vdest = in_over (s, sa, vm, load8888 (*dst));
++//		    *dst = store8888 (vdest);
++
++		}
++	    }
++	    src++;
++	    dst++;
++	}
++    }
++}
++
++
++
++
++
++static void
++ls_composite_over_8888_8888 (pixman_implementation_t *imp,
++                              pixman_op_t              op,
++                              pixman_image_t *         src_image,
++                              pixman_image_t *         mask_image,
++                              pixman_image_t *         dst_image,
++                              int32_t                  src_x,
++                              int32_t                  src_y,
++                              int32_t                  mask_x,
++                              int32_t                  mask_y,
++                              int32_t                  dest_x,
++                              int32_t                  dest_y,
++                              int32_t                  width,
++                              int32_t                  height)
++{
++    uint32_t *dst_line, *dst;
++    uint32_t *src_line, *src;
++    uint32_t s;
++    int dst_stride, src_stride;
++    uint8_t a;
++    int32_t w;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	src = src_line;
++	src_line += src_stride;
++	w = width;
++
++	while (w--)
++	{
++	    s = *src;
++	    a = s >> 24;
++
++	    if (a == 0xff)
++	    {
++		*dst = s;
++	    }
++	    else if (s)
++	    {
++			
++				__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f24) 
++		load8888r(%0,$f20)
++		expand_alpha($f24,$f26)
++		over($f24,$f26,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dst):"r"(*src):clobber
++		);
++	    }
++		dst++;
++		src++;	
++
++	}
++    }
++}
++
++
++static void
++ls_composite_over_8888_n_8888 (pixman_implementation_t *imp,
++                                pixman_op_t              op,
++                                pixman_image_t *         src_image,
++                                pixman_image_t *         mask_image,
++                                pixman_image_t *         dst_image,
++                                int32_t                  src_x,
++                                int32_t                  src_y,
++                                int32_t                  mask_x,
++                                int32_t                  mask_y,
++                                int32_t                  dest_x,
++                                int32_t                  dest_y,
++                                int32_t                  width,
++                                int32_t                  height)
++{
++    uint32_t    *dst_line, *dst;
++    uint32_t    *src_line, *src;
++    uint32_t mask;
++    __m64 vmask;
++    int dst_stride, src_stride;
++    int32_t w;
++    __m64 srca;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++
++    mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
++    mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888(%1,$f24)
++	store64a($f24,%0)
++	:"=m"(vmask):"m"(mask):clobber
++	);
++
++    srca = ls_4x00ff;
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	src = src_line;
++	src_line += src_stride;
++	w = width;
++
++	while (w)
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++		load8888r(%0,$f22) 
++		expand_alpha($f20,$f28)
++		in_over($f20,$f28,$f24,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dst):"r"(*src):clobber
++		);
++
++	    w--;
++	    dst++;
++	    src++;
++	}
++    }
++}
++
++static void
++ls_composite_over_n_8888 (pixman_implementation_t *imp,
++                           pixman_op_t              op,
++                           pixman_image_t *         src_image,
++                           pixman_image_t *         mask_image,
++                           pixman_image_t *         dst_image,
++                           int32_t                  src_x,
++                           int32_t                  src_y,
++                           int32_t                  mask_x,
++                           int32_t                  mask_y,
++                           int32_t                  dest_x,
++                           int32_t                  dest_y,
++                           int32_t                  width,
++                           int32_t                  height)
++{
++    uint32_t src;
++    uint32_t    *dst_line, *dst;
++    int32_t w;
++    int dst_stride;
++    __m64 vsrc, vsrca; 
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    if (src == 0)
++	return;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64($f24,%0)
++	expand_alpha($f24,$f26)
++	store64($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	w = width;
++
++	while (w)
++	{
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%0,$f28)
++	over($f24,$f26,$f28)
++	store8888r($f8,%0)
++	:"+r"(*dst)::clobber
++	);
++
++	    w--;
++	    dst++;
++	}
++    }
++}
++
++static void
++ls_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
++                                   pixman_op_t              op,
++                                   pixman_image_t *         src_image,
++                                   pixman_image_t *         mask_image,
++                                   pixman_image_t *         dst_image,
++                                   int32_t                  src_x,
++                                   int32_t                  src_y,
++                                   int32_t                  mask_x,
++                                   int32_t                  mask_y,
++                                   int32_t                  dest_x,
++                                   int32_t                  dest_y,
++                                   int32_t                  width,
++                                   int32_t                  height)
++{
++    uint32_t src, srca;
++    uint32_t    *dst_line;
++    uint32_t    *mask_line;
++    int dst_stride, mask_stride;
++    __m64 vsrc, vsrca;
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    srca = src >> 24;
++    if (src == 0)
++	return;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64($f24,%0)
++	expand_alpha($f24,$f26)
++	store64($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++
++    while (height--)
++    {
++	int twidth = width;
++	uint32_t *p = (uint32_t *)mask_line;
++	uint32_t *q = (uint32_t *)dst_line;
++
++	while (twidth)
++	{
++
++	    if (*p)
++	    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f28)
++		load8888r(%1,$f20)
++		in_over($f24,$f26,$f20,$f28)
++		store8888r($f8,%0)
++		:"+r"(*q):"r"(*p):clobber
++		);
++	    }
++	    twidth--;
++	    p++;
++	    q++;
++	}
++
++	dst_line += dst_stride;
++	mask_line += mask_stride;
++    }
++}
++
++
++static void
++ls_composite_over_n_8_8888 (pixman_implementation_t *imp,
++                             pixman_op_t              op,
++                             pixman_image_t *         src_image,
++                             pixman_image_t *         mask_image,
++                             pixman_image_t *         dst_image,
++                             int32_t                  src_x,
++                             int32_t                  src_y,
++                             int32_t                  mask_x,
++                             int32_t                  mask_y,
++                             int32_t                  dest_x,
++                             int32_t                  dest_y,
++                             int32_t                  width,
++                             int32_t                  height)
++{
++    uint32_t src, srca;
++    uint32_t *dst_line, *dst;
++    uint8_t *mask_line, *mask;
++    int dst_stride, mask_stride;
++    int32_t w;
++    __m64 vsrc, vsrca;
++    uint64_t srcsrc;
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    srca = src >> 24;
++    if (src == 0)
++	return;
++
++    srcsrc = (uint64_t)src << 32 | src;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64a($f24,%0)
++	expand_alpha($f24,$f26)
++	store64a($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	mask = mask_line;
++	mask_line += mask_stride;
++	w = width;
++
++	while (w)
++	{
++	    uint32_t m = *mask;
++
++	    if (m)
++	    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20)
++		load32r(%1,$f22)
++		expand_alpha_rev($f22,$f28)
++		in_over($f24,$f26,$f28,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dst):"r"(m):clobber
++		);
++	    }
++
++	    w--;
++	    mask++;
++	    dst++;
++	}
++    }
++
++}
++
++static void
++ls_composite_over_x888_n_8888 (pixman_implementation_t *imp,
++                                pixman_op_t              op,
++                                pixman_image_t *         src_image,
++                                pixman_image_t *         mask_image,
++                                pixman_image_t *         dst_image,
++                                int32_t                  src_x,
++                                int32_t                  src_y,
++                                int32_t                  mask_x,
++                                int32_t                  mask_y,
++                                int32_t                  dest_x,
++                                int32_t                  dest_y,
++                                int32_t                  width,
++                                int32_t                  height)
++{
++    uint32_t *dst_line, *dst;
++    uint32_t *src_line, *src;
++    uint32_t mask;
++    __m64 vmask;
++    int dst_stride, src_stride;
++    int32_t w;
++    __m64 srca;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++    mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
++
++    mask &= 0xff000000;
++    mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%1,$f24)
++	store64a($f24,%0)
++	:"=m"(vmask):"r"(mask):clobber
++	);
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load64a(%1,$f26)
++	store64a($f26,%0)
++	:"=m"(srca):"m"(ls_4x00ff):clobber
++	);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	src = src_line;
++	src_line += src_stride;
++	w = width;
++
++	while (w)
++	{
++		uint32_t src_tmp = *src | 0xff000000;
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20)
++		load8888r(%0,$f22)		
++		in_over($f20,$f26,$f24,$f22)
++		store8888r($f8,%0)
++		:"+r"(*dst):"r"(src_tmp):clobber
++		);
++
++	    w--;
++	    dst++;
++	    src++;
++	}
++    }
++}
++
++
++static void
++ls_composite_over_8888_0565 (pixman_implementation_t *imp,
++                               pixman_op_t              op,
++                               pixman_image_t *         src_image,
++                               pixman_image_t *         mask_image,
++                               pixman_image_t *         dst_image,
++                               int32_t                  src_x,
++                               int32_t                  src_y,
++                               int32_t                  mask_x,
++                               int32_t                  mask_y,
++                               int32_t                  dest_x,
++                               int32_t                  dest_y,
++                               int32_t                  width,
++                               int32_t                  height)
++{
++    uint16_t    *dst_line, *dst;
++    uint32_t d;
++    uint32_t    *src_line, *src, s;
++    uint8_t a;
++    int dst_stride, src_stride;
++    int32_t w;
++
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	src = src_line;
++	src_line += src_stride;
++	w = width;
++
++	while (w--)
++	{
++	    s = *src++;
++	    a = s >> 24;
++	    if (s)
++	    {
++		if (a == 0xff)
++		{
++		    d = s;
++		}
++		else
++		{
++		    d = *dst;
++		    d = CONVERT_0565_TO_0888 (d);
++
++		    __asm__ volatile (
++		    ".set arch=loongson2f \n\t"     
++		    load8888r(%1,$f24) 
++		    load8888r(%0,$f20)
++		    expand_alpha($f24,$f26) 
++		    over($f24,$f26,$f20)
++		    store8888r($f8,%0)
++		    :"+r"(d):"r"(s):clobber
++		    );
++
++
++		}
++		*dst = CONVERT_8888_TO_0565 (d);
++	    }
++	    dst++;
++	}
++    }
++}
++
++static void
++ls_composite_over_n_0565 (pixman_implementation_t *imp,
++                           pixman_op_t              op,
++                           pixman_image_t *         src_image,
++                           pixman_image_t *         mask_image,
++                           pixman_image_t *         dst_image,
++                           int32_t                  src_x,
++                           int32_t                  src_y,
++                           int32_t                  mask_x,
++                           int32_t                  mask_y,
++                           int32_t                  dest_x,
++                           int32_t                  dest_y,
++                           int32_t                  width,
++                           int32_t                  height)
++{
++    uint32_t src;
++    uint32_t d;
++    uint16_t    *dst_line, *dst;
++    int32_t w;
++    int dst_stride;
++    __m64 vsrc, vsrca;
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    if (src == 0)
++	return;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64a($f24,%0)
++	expand_alpha($f24,$f26)
++	store64a($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	w = width;
++
++	while (w)
++	{
++
++		d = *dst;
++		d = CONVERT_0565_TO_0888 (d);
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20)
++
++		over($f24,$f26,$f20)
++		store8888r($f8,%0)
++		:"+r"(d)::clobber
++		);
++
++		*dst = CONVERT_8888_TO_0565 (d);
++
++	    w--;
++	    dst++;
++	}
++    }
++}
++
++static void
++ls_composite_over_n_8_0565 (pixman_implementation_t *imp,
++                             pixman_op_t              op,
++                             pixman_image_t *         src_image,
++                             pixman_image_t *         mask_image,
++                             pixman_image_t *         dst_image,
++                             int32_t                  src_x,
++                             int32_t                  src_y,
++                             int32_t                  mask_x,
++                             int32_t                  mask_y,
++                             int32_t                  dest_x,
++                             int32_t                  dest_y,
++                             int32_t                  width,
++                             int32_t                  height)
++{
++    uint32_t src, srca, m, d;
++    uint16_t *dst_line, *dst;
++    uint8_t *mask_line, *mask;
++    int dst_stride, mask_stride;
++    int32_t w;
++    __m64 vsrc, vsrca;
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    srca = src >> 24;
++    if (src == 0)
++	return;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64a($f24,%0)
++	expand_alpha($f24,$f26)
++	store64a($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	mask = mask_line;
++	mask_line += mask_stride;
++	w = width;
++
++	while (w)
++	{
++	    m = *mask;
++	    d = *dst;
++
++	    if (m)
++	    {
++
++		d = CONVERT_0565_TO_0888 (d);
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20)
++		load32r(%1,$f22)
++		expand_alpha_rev($f22,$f28)
++		in_over($f24,$f26,$f28,$f20)
++		store8888r($f8,%0)
++		:"+r"(d):"r"(m):clobber
++		);
++
++		*dst = CONVERT_8888_TO_0565 (d);
++
++	    }
++
++	    w--;
++	    mask++;
++	    dst++;
++	}
++    }
++}
++
++static void
++ls_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
++                                   pixman_op_t              op,
++                                   pixman_image_t *         src_image,
++                                   pixman_image_t *         mask_image,
++                                   pixman_image_t *         dst_image,
++                                   int32_t                  src_x,
++                                   int32_t                  src_y,
++                                   int32_t                  mask_x,
++                                   int32_t                  mask_y,
++                                   int32_t                  dest_x,
++                                   int32_t                  dest_y,
++                                   int32_t                  width,
++                                   int32_t                  height)
++{
++    uint32_t src, srca, m, d;
++    uint16_t    *dst_line;
++    uint32_t    *mask_line;
++    int dst_stride, mask_stride;
++    __m64 vsrc, vsrca;
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    srca = src >> 24;
++    if (src == 0)
++	return;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64a($f24,%0)
++	expand_alpha($f24,$f26)
++	store64a($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++
++    while (height--)
++    {
++	int twidth = width;
++	uint32_t *p = (uint32_t *)mask_line;
++	uint16_t *q = (uint16_t *)dst_line;
++
++	while (twidth)
++	{
++
++	    m = *(uint32_t *)p;
++	    d = *q;
++
++	    if (m)
++	    {
++
++		d = CONVERT_0565_TO_0888 (d);
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%0,$f20)
++		load8888r(%1,$f22)
++		in_over($f24,$f26,$f22,$f20)
++		store8888r($f8,%0)
++		:"+r"(d):"r"(m):clobber
++		);
++
++		*q = CONVERT_8888_TO_0565 (d);
++
++	    }
++
++	    twidth--;
++	    p++;
++	    q++;
++	}
++
++	mask_line += mask_stride;
++	dst_line += dst_stride;
++    }
++}
++static void
++ls_composite_over_pixbuf_8888 (pixman_implementation_t *imp,
++                                pixman_op_t              op,
++                                pixman_image_t *         src_image,
++                                pixman_image_t *         mask_image,
++                                pixman_image_t *         dst_image,
++                                int32_t                  src_x,
++                                int32_t                  src_y,
++                                int32_t                  mask_x,
++                                int32_t                  mask_y,
++                                int32_t                  dest_x,
++                                int32_t                  dest_y,
++                                int32_t                  width,
++                                int32_t                  height)
++{
++    uint32_t    *dst_line, *dst;
++    uint32_t    *src_line, *src;
++    int dst_stride, src_stride;
++    int32_t w;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++
++#if 0
++    /* FIXME */
++    assert (src_image->drawable == mask_image->drawable);
++#endif
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	src = src_line;
++	src_line += src_stride;
++	w = width;
++
++	while (w)
++	{
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f22) 
++		load8888r(%0,$f20) 
++		over_rev_non_pre($f22,$f20)
++		store8888r($f8,%0)
++		:"+r"(*dst):"r"(*src):clobber
++		);
++
++	    w--;
++	    dst++;
++	    src++;
++	}
++    }
++}
++static void
++ls_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
++                                pixman_op_t              op,
++                                pixman_image_t *         src_image,
++                                pixman_image_t *         mask_image,
++                                pixman_image_t *         dst_image,
++                                int32_t                  src_x,
++                                int32_t                  src_y,
++                                int32_t                  mask_x,
++                                int32_t                  mask_y,
++                                int32_t                  dest_x,
++                                int32_t                  dest_y,
++                                int32_t                  width,
++                                int32_t                  height)
++{
++    uint16_t    *dst_line, *dst;
++    uint32_t    *src_line, *src, d;
++    int dst_stride, src_stride;
++    int32_t w;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
++
++#if 0
++    /* FIXME */
++    assert (src_image->drawable == mask_image->drawable);
++#endif
++
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	src = src_line;
++	src_line += src_stride;
++	w = width;
++
++	while (w)
++	{
++
++		d = *dst;
++		d = CONVERT_0565_TO_0888 (d);
++
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load8888r(%1,$f20) 
++		load8888r(%0,$f24) 
++		over_rev_non_pre($f20,$f24)
++		store8888r($f8,%0)
++		:"+r"(d):"r"(*src):clobber
++		);
++
++		*dst = CONVERT_8888_TO_0565 (d);
++
++	    w--;
++	    dst++;
++	    src++;
++	}
++    }
++}
++
++static void
++ls_composite_src_n_8_8888 (pixman_implementation_t *imp,
++                            pixman_op_t              op,
++                            pixman_image_t *         src_image,
++                            pixman_image_t *         mask_image,
++                            pixman_image_t *         dst_image,
++                            int32_t                  src_x,
++                            int32_t                  src_y,
++                            int32_t                  mask_x,
++                            int32_t                  mask_y,
++                            int32_t                  dest_x,
++                            int32_t                  dest_y,
++                            int32_t                  width,
++                            int32_t                  height)
++{
++    uint32_t src, srca;
++    uint32_t    *dst_line, *dst, m;
++    uint8_t     *mask_line, *mask;
++    int dst_stride, mask_stride;
++    int32_t w;
++    __m64 vsrc, vsrca;
++    uint64_t srcsrc;
++
++    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++    srca = src >> 24;
++    if (src == 0)
++    {
++	pixman_fill_ls (dst_image->bits.bits, dst_image->bits.rowstride,
++			 PIXMAN_FORMAT_BPP (dst_image->bits.format),
++	                 dest_x, dest_y, width, height, 0);
++	return;
++    }
++
++    srcsrc = (uint64_t)src << 32 | src;
++
++    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
++    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"	
++	load8888r(%2,$f24)
++	store64a($f24,%0)
++	expand_alpha($f24,$f26)
++	store64a($f26,%1)
++	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
++	);
++    while (height--)
++    {
++	dst = dst_line;
++	dst_line += dst_stride;
++	mask = mask_line;
++	mask_line += mask_stride;
++	w = width;
++
++	while (w)
++	{
++	    m = *mask;
++
++	    if (m)
++	    {
++		__asm__ volatile (
++		".set arch=loongson2f \n\t"	
++		load32r(%1,$f20)
++		expand_alpha_rev($f20,$f28)
++		in($f24,$f28)
++		store8888r($f8,%0)
++		:"=r"(*dst):"r"(m):clobber
++		);
++
++	    }
++	    else
++	    {
++		*dst = 0;
++	    }
++
++	    w--;
++	    mask++;
++	    dst++;
++	}
++    }
++}
+diff -urN pixman//pixman/pixman-cpu.c Pixman.Loongson//pixman/pixman-cpu.c
+--- pixman//pixman/pixman-cpu.c	2010-12-25 18:46:00.073234000 +0800
++++ Pixman.Loongson//pixman/pixman-cpu.c	2010-12-25 18:39:15.360337000 +0800
+@@ -579,7 +579,9 @@
+     if (pixman_have_mmx ())
+ 	return _pixman_implementation_create_mmx ();
+ #endif
+-
++#ifdef USE_LS
++	return _pixman_implementation_create_ls ();
++#endif
+ #ifdef USE_ARM_NEON
+     if (pixman_have_arm_neon ())
+ 	return _pixman_implementation_create_arm_neon ();
+diff -urN pixman//pixman/pixman-ls.c Pixman.Loongson//pixman/pixman-ls.c
+--- pixman//pixman/pixman-ls.c	1970-01-01 08:00:00.000000000 +0800
++++ Pixman.Loongson//pixman/pixman-ls.c	2010-12-25 18:39:15.386759000 +0800
+@@ -0,0 +1,538 @@
++/*
++* Based on pixman-mmx.c
++* Implemented for loongson 2F only.
++* Free software based on GPL licence.
++* Copyright 2010 WG Ge.
++*/
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++#include <stdlib.h>
++#include <string.h>
++#include <math.h>
++#include <limits.h>
++#include <stdio.h>
++#include "pixman-private.h"
++#include "pixman-combine32.h"
++#include "primitive.h"
++
++#define __m64  __attribute__ ((aligned (8))) uint64_t
++#define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
++#define DECLARE_ALIGNED_8(t, v, ...)  DECLARE_ALIGNED(8, t, v)
++
++DECLARE_ALIGNED_8 (const uint64_t, ls_4x00ff                  ) = 0x00ff00ff00ff00ffULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_4x0080                  ) = 0x0080008000800080ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_565_rgb                 ) = 0x000001f0003f001fULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_565_unpack_multiplier   ) = 0x0000008404100840ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_565_r                   ) = 0x000000f800000000ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_565_g                   ) = 0x0000000000fc0000ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_565_b                   ) = 0x00000000000000f8ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_mask_0                  ) = 0xffffffffffff0000ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_mask_1                  ) = 0xffffffff0000ffffULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_mask_2                  ) = 0xffff0000ffffffffULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_mask_3                  ) = 0x0000ffffffffffffULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_full_alpha              ) = 0x00ff000000000000ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_ffff0000ffff0000        ) = 0xffff0000ffff0000ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_0000ffff00000000        ) = 0x0000ffff00000000ULL;
++DECLARE_ALIGNED_8 (const uint64_t, ls_000000000000ffff        ) = 0x000000000000ffffULL;
++
++
++pixman_bool_t
++pixman_fill_ls (uint32_t *bits,
++                 int       stride,
++                 int       bpp,
++                 int       x,
++                 int       y,
++                 int       width,
++                 int       height,
++                 uint32_t xor)
++{
++    uint64_t fill;
++    uint32_t byte_width;
++    uint8_t     *byte_line;
++
++
++
++    if (bpp != 16 && bpp != 32 && bpp != 8)
++	return FALSE;
++
++    if (bpp == 8)
++    {
++	stride = stride * (int) sizeof (uint32_t) / 1;
++	byte_line = (uint8_t *)(((uint8_t *)bits) + stride * y + x);
++	byte_width = width;
++	stride *= 1;
++        xor = (xor & 0xff) * 0x01010101;
++    }
++    else if (bpp == 16)
++    {
++	stride = stride * (int) sizeof (uint32_t) / 2;
++	byte_line = (uint8_t *)(((uint16_t *)bits) + stride * y + x);
++	byte_width = 2 * width;
++	stride *= 2;
++        xor = (xor & 0xffff) * 0x00010001;
++    }
++    else
++    {
++	stride = stride * (int) sizeof (uint32_t) / 4;
++	byte_line = (uint8_t *)(((uint32_t *)bits) + stride * y + x);
++	byte_width = 4 * width;
++	stride *= 4;
++    }
++
++    fill = ((uint64_t)xor << 32) | xor;
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"
++	"ldc1 $f24, %0 \n\t"
++	::"m"(fill):"$f24"
++	);
++    while (height--)
++    {
++	int w;
++	uint8_t *d = byte_line;
++
++	byte_line += stride;
++	w = byte_width;
++
++	while (w >= 1 && ((unsigned long)d & 1))
++	{
++	    *(uint8_t *)d = (xor & 0xff);
++	    w--;
++	    d++;
++	}
++
++	while (w >= 2 && ((unsigned long)d & 3))
++	{
++	    *(uint16_t *)d = xor;
++	    w -= 2;
++	    d += 2;
++	}
++
++	while (w >= 4 && ((unsigned long)d & 7))
++	{
++	    *(uint32_t *)d = xor;
++
++	    w -= 4;
++	    d += 4;
++	}
++
++	while (w >= 64)
++	{
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"
++	"dmfc1 $8, $f24 \n\t"
++	"sd $8 ,   (%0) \n\t"
++	"sd $8 ,   8(%0) \n\t"	
++	"sd $8 ,   16(%0) \n\t"
++	"sd $8 ,   24(%0) \n\t"
++	"sd $8 ,   32(%0) \n\t"          
++	"sd $8 ,   40(%0) \n\t"	       
++	"sd $8 ,   48(%0) \n\t"        
++	"sd $8 ,   56(%0) \n\t"        
++	::"r"(d):"$8","memory","$f24"
++	);
++	    w -= 64;
++	    d += 64;
++	}
++
++	while (w >= 4)
++	{
++	    *(uint32_t *)d = xor;
++
++	    w -= 4;
++	    d += 4;
++	}
++	while (w >= 2)
++	{
++	    *(uint16_t *)d = xor;
++	    w -= 2;
++	    d += 2;
++	}
++	while (w >= 1)
++	{
++	    *(uint8_t *)d = (xor & 0xff);
++	    w--;
++	    d++;
++	}
++
++    }
++    return TRUE;
++}
++
++static pixman_bool_t
++pixman_blt_ls (uint32_t *src_bits,
++                uint32_t *dst_bits,
++                int       src_stride,
++                int       dst_stride,
++                int       src_bpp,
++                int       dst_bpp,
++                int       src_x,
++                int       src_y,
++                int       dst_x,
++                int       dst_y,
++                int       width,
++                int       height)
++{
++    uint8_t *   src_bytes;
++    uint8_t *   dst_bytes;
++    int byte_width;
++
++    if (src_bpp != dst_bpp)
++	return FALSE;
++
++    if (src_bpp == 16)
++    {
++	src_stride = src_stride * (int) sizeof (uint32_t) / 2;
++	dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
++	src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
++	dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
++	byte_width = 2 * width;
++	src_stride *= 2;
++	dst_stride *= 2;
++    }
++    else if (src_bpp == 32)
++    {
++	src_stride = src_stride * (int) sizeof (uint32_t) / 4;
++	dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
++	src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
++	dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
++	byte_width = 4 * width;
++	src_stride *= 4;
++	dst_stride *= 4;
++    }
++    else
++    {
++	return FALSE;
++    }
++
++    while (height--)
++    {
++	int w;
++	uint8_t *s = src_bytes;
++	uint8_t *d = dst_bytes;
++	src_bytes += src_stride;
++	dst_bytes += dst_stride;
++	w = byte_width;
++
++	while (w >= 2 && ((unsigned long)d & 3))
++	{
++	    *(uint16_t *)d = *(uint16_t *)s;
++	    w -= 2;
++	    s += 2;
++	    d += 2;
++	}
++
++	while (w >= 4 && ((unsigned long)d & 7))
++	{
++	    *(uint32_t *)d = *(uint32_t *)s;
++
++	    w -= 4;
++	    s += 4;
++	    d += 4;
++	}
++ if ((unsigned long)s & 7)
++{
++	while (w >= 64)
++	{
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"
++	"uld $8 ,   (%1) \n\t"
++	"uld $9 ,  8(%1) \n\t"
++	"uld $10, 16(%1) \n\t"
++	"uld $11, 24(%1) \n\t"
++	"sd $8 ,   (%0) \n\t"
++	"sd $9 ,   8(%0) \n\t"	
++	"sd $10,   16(%0) \n\t"
++	"sd $11,   24(%0) \n\t"
++
++	"uld $8 ,   32(%1) \n\t"
++	"uld $9 ,   40(%1) \n\t"
++	"uld $10,   48(%1) \n\t"
++	"uld $11,   56(%1) \n\t"
++	"sd $8 ,   32(%0) \n\t"          
++	"sd $9 ,   40(%0) \n\t"	       
++	"sd $10,   48(%0) \n\t"        
++	"sd $11,   56(%0) \n\t"        
++	::"r"(d),"r"(s):"$8","$9","$10","$11","memory"
++	);
++	    w -= 64;
++	    s += 64;
++	    d += 64;
++	}
++}
++else
++{
++	while (w >= 64)
++	{
++
++	__asm__ volatile (
++	".set arch=loongson2f \n\t"
++	"ld $8 ,   (%1) \n\t"
++	"ld $9 ,  8(%1) \n\t"
++	"ld $10, 16(%1) \n\t"
++	"ld $11, 24(%1) \n\t"
++	"sd $8 ,   (%0) \n\t"
++	"sd $9 ,   8(%0) \n\t"	
++	"sd $10,   16(%0) \n\t"
++	"sd $11,   24(%0) \n\t"
++
++	"ld $8 ,   32(%1) \n\t"
++	"ld $9 ,   40(%1) \n\t"
++	"ld $10,   48(%1) \n\t"
++	"ld $11,   56(%1) \n\t"
++	"sd $8 ,   32(%0) \n\t"          
++	"sd $9 ,   40(%0) \n\t"	       
++	"sd $10,   48(%0) \n\t"        
++	"sd $11,   56(%0) \n\t"        
++	::"r"(d),"r"(s):"$8","$9","$10","$11","memory"
++	);
++	    w -= 64;
++	    s += 64;
++	    d += 64;
++	}
++}	
++
++	while (w >= 4)
++	{
++	    *(uint32_t *)d = *(uint32_t *)s;
++
++	    w -= 4;
++	    s += 4;
++	    d += 4;
++	}
++	if (w >= 2)
++	{
++	    *(uint16_t *)d = *(uint16_t *)s;
++	    w -= 2;
++	    s += 2;
++	    d += 2;
++	}
++    }
++    return TRUE;
++}
++
++
++#include "pixman-composite-ls.c"
++#include "pixman-combine-ls.c"
++
++static pixman_bool_t
++ls_blt (pixman_implementation_t *imp,
++         uint32_t *               src_bits,
++         uint32_t *               dst_bits,
++         int                      src_stride,
++         int                      dst_stride,
++         int                      src_bpp,
++         int                      dst_bpp,
++         int                      src_x,
++         int                      src_y,
++         int                      dst_x,
++         int                      dst_y,
++         int                      width,
++         int                      height)
++{
++    if (!pixman_blt_ls (
++            src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
++            src_x, src_y, dst_x, dst_y, width, height))
++    {
++	return _pixman_implementation_blt (
++	    imp->delegate,
++	    src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
++	    src_x, src_y, dst_x, dst_y, width, height);
++    }
++
++    return TRUE;
++}
++
++static pixman_bool_t
++ls_fill (pixman_implementation_t *imp,
++          uint32_t *               bits,
++          int                      stride,
++          int                      bpp,
++          int                      x,
++          int                      y,
++          int                      width,
++          int                      height,
++          uint32_t xor)
++{
++    if (!pixman_fill_ls (bits, stride, bpp, x, y, width, height, xor))
++    {
++	return _pixman_implementation_fill (
++	    imp->delegate, bits, stride, bpp, x, y, width, height, xor);
++    }
++
++    return TRUE;
++}
++

++static void
++ls_composite_copy_area (pixman_implementation_t *imp,
++                         pixman_op_t              op,
++                         pixman_image_t *         src_image,
++                         pixman_image_t *         mask_image,
++                         pixman_image_t *         dst_image,
++                         int32_t                  src_x,
++                         int32_t                  src_y,
++                         int32_t                  mask_x,
++                         int32_t                  mask_y,
++                         int32_t                  dest_x,
++                         int32_t                  dest_y,
++                         int32_t                  width,
++                         int32_t                  height)
++{
++    pixman_blt_ls (src_image->bits.bits,
++                    dst_image->bits.bits,
++                    src_image->bits.rowstride,
++                    dst_image->bits.rowstride,
++                    PIXMAN_FORMAT_BPP (src_image->bits.format),
++                    PIXMAN_FORMAT_BPP (dst_image->bits.format),
++                    src_x, src_y, dest_x, dest_y, width, height);
++}
++
++
++static const pixman_fast_path_t ls_fast_paths[] =
++{
++
++//these are implemented so far
++#if 1
++    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, a8,       x8r8g8b8, ls_composite_over_x888_8_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, a8,       a8r8g8b8, ls_composite_over_x888_8_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, a8,       x8b8g8r8, ls_composite_over_x888_8_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, a8,       a8b8g8r8, ls_composite_over_x888_8_8888    ),
++#endif
++
++#if 1
++//over_8888_0565 significant perf improvement, slight better L1, L2, 30% better RT
++    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, null,     r5g6b5,   ls_composite_over_8888_0565      ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, null,     b5g6r5,   ls_composite_over_8888_0565      ),
++    PIXMAN_STD_FAST_PATH    (OVER, pixbuf,   pixbuf,   r5g6b5,   ls_composite_over_pixbuf_0565    ),
++    PIXMAN_STD_FAST_PATH    (OVER, rpixbuf,  rpixbuf,  b5g6r5,   ls_composite_over_pixbuf_0565    ),
++
++//big improvement some closing 100%
++    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8b8g8r8, b5g6r5,   ls_composite_over_n_8888_0565_ca ),
++    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8r8g8b8, r5g6b5,   ls_composite_over_n_8888_0565_ca ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       r5g6b5,   ls_composite_over_n_8_0565       ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       b5g6r5,   ls_composite_over_n_8_0565       ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     r5g6b5,   ls_composite_over_n_0565         ),
++
++//ubalbe to bench with lowlevel bench, believe it is a gain in perf
++    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, solid,    a8r8g8b8, ls_composite_over_x888_n_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, solid,    x8r8g8b8, ls_composite_over_x888_n_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, solid,    a8b8g8r8, ls_composite_over_x888_n_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, solid,    x8b8g8r8, ls_composite_over_x888_n_8888    ),
++
++//performance regress 30% in L1,L2, but significant improvement in RT
++    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, null,     a8b8g8r8, ls_composite_over_8888_8888      ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, null,     x8b8g8r8, ls_composite_over_8888_8888      ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, null,     a8r8g8b8, ls_composite_over_8888_8888      ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, null,     x8r8g8b8, ls_composite_over_8888_8888      ),
++    PIXMAN_STD_FAST_PATH    (OVER, pixbuf,   pixbuf,   a8r8g8b8, ls_composite_over_pixbuf_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, pixbuf,   pixbuf,   x8r8g8b8, ls_composite_over_pixbuf_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, rpixbuf,  rpixbuf,  a8b8g8r8, ls_composite_over_pixbuf_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, rpixbuf,  rpixbuf,  x8b8g8r8, ls_composite_over_pixbuf_8888    ),
++
++//same performance in L1,L2, but significant improvement in RT 30-40%
++    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, solid,    a8r8g8b8, ls_composite_over_8888_n_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, solid,    x8r8g8b8, ls_composite_over_8888_n_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, solid,    a8b8g8r8, ls_composite_over_8888_n_8888    ),
++    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, solid,    x8b8g8r8, ls_composite_over_8888_n_8888    ),
++
++//significant perf improvement 20%
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       a8r8g8b8, ls_composite_over_n_8_8888       ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       x8r8g8b8, ls_composite_over_n_8_8888       ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       a8b8g8r8, ls_composite_over_n_8_8888       ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       x8b8g8r8, ls_composite_over_n_8_8888       ),
++
++//3 times perf improvements
++    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8r8g8b8, a8r8g8b8, ls_composite_over_n_8888_8888_ca ),
++    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8r8g8b8, x8r8g8b8, ls_composite_over_n_8888_8888_ca ),
++    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8b8g8r8, a8b8g8r8, ls_composite_over_n_8888_8888_ca ),
++    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8b8g8r8, x8b8g8r8, ls_composite_over_n_8888_8888_ca ),
++
++//significant performance boost
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     a8r8g8b8, ls_composite_over_n_8888         ),
++    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     x8r8g8b8, ls_composite_over_n_8888         ),
++//simple add, expect better perf in generic code
++//    PIXMAN_STD_FAST_PATH    (ADD,  a8r8g8b8, null,     a8r8g8b8, ls_composite_add_8888_8888       ),
++//    PIXMAN_STD_FAST_PATH    (ADD,  a8b8g8r8, null,     a8b8g8r8, ls_composite_add_8888_8888       ),
++
++// FIXME: Copy memory are not better than geneic code
++#if 0
++    PIXMAN_STD_FAST_PATH    (SRC,  a8r8g8b8, null,     a8r8g8b8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  a8b8g8r8, null,     a8b8g8r8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  a8r8g8b8, null,     x8r8g8b8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  a8b8g8r8, null,     x8b8g8r8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  x8r8g8b8, null,     x8r8g8b8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  x8b8g8r8, null,     x8b8g8r8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  r5g6b5,   null,     r5g6b5,   ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (SRC,  b5g6r5,   null,     b5g6r5,   ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, null,     x8r8g8b8, ls_composite_copy_area           ),
++    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, null,     x8b8g8r8, ls_composite_copy_area           ),
++#endif
++
++//significant improvement
++    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       a8r8g8b8, ls_composite_src_n_8_8888        ),
++    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       x8r8g8b8, ls_composite_src_n_8_8888        ),
++    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       a8b8g8r8, ls_composite_src_n_8_8888        ),
++    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       x8b8g8r8, ls_composite_src_n_8_8888        ),
++
++#endif
++
++//these are not yet implemented
++
++#if 0
++
++    PIXMAN_STD_FAST_PATH    (ADD,  a8,       null,     a8,       ls_composite_add_8000_8000       ),
++    PIXMAN_STD_FAST_PATH    (ADD,  solid,    a8,       a8,       ls_composite_add_n_8_8           ),
++    PIXMAN_STD_FAST_PATH    (IN,   a8,       null,     a8,       ls_composite_in_8_8              ),
++    PIXMAN_STD_FAST_PATH    (IN,   solid,    a8,       a8,       ls_composite_in_n_8_8            ),
++#endif
++
++
++    { PIXMAN_OP_NONE },
++};
++
++pixman_implementation_t *
++_pixman_implementation_create_ls (void)
++{
++    pixman_implementation_t *general = _pixman_implementation_create_fast_path ();
++    pixman_implementation_t *imp = _pixman_implementation_create (general, ls_fast_paths);
++
++//Turned on but unable to benchmark.
++#if 1
++    imp->combine_32[PIXMAN_OP_OVER] = ls_combine_over_u;
++    imp->combine_32[PIXMAN_OP_OVER_REVERSE] = ls_combine_over_reverse_u;
++    imp->combine_32[PIXMAN_OP_IN] = ls_combine_in_u;
++    imp->combine_32[PIXMAN_OP_IN_REVERSE] = ls_combine_in_reverse_u;
++    imp->combine_32[PIXMAN_OP_OUT] = ls_combine_out_u;
++    imp->combine_32[PIXMAN_OP_OUT_REVERSE] = ls_combine_out_reverse_u;
++    imp->combine_32[PIXMAN_OP_ATOP] = ls_combine_atop_u;
++    imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = ls_combine_atop_reverse_u;
++    imp->combine_32[PIXMAN_OP_XOR] = ls_combine_xor_u;
++    imp->combine_32[PIXMAN_OP_ADD] = ls_combine_add_u;
++    imp->combine_32[PIXMAN_OP_SATURATE] = ls_combine_saturate_u;
++
++    imp->combine_32_ca[PIXMAN_OP_SRC] = ls_combine_src_ca;
++    imp->combine_32_ca[PIXMAN_OP_OVER] = ls_combine_over_ca;
++    imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = ls_combine_over_reverse_ca;
++    imp->combine_32_ca[PIXMAN_OP_IN] = ls_combine_in_ca;
++    imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = ls_combine_in_reverse_ca;
++    imp->combine_32_ca[PIXMAN_OP_OUT] = ls_combine_out_ca;
++    imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = ls_combine_out_reverse_ca;
++    imp->combine_32_ca[PIXMAN_OP_ATOP] = ls_combine_atop_ca;
++    imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = ls_combine_atop_reverse_ca;
++    imp->combine_32_ca[PIXMAN_OP_XOR] = ls_combine_xor_ca;
++    imp->combine_32_ca[PIXMAN_OP_ADD] = ls_combine_add_ca;
++#endif
++
++//FIXME blt and fill not shown better perf than geneic code
++#if 0
++    imp->blt = ls_blt;
++    imp->fill = ls_fill;
++#endif
++
++    return imp;
++}
++
+diff -urN pixman//pixman/pixman-private.h Pixman.Loongson//pixman/pixman-private.h
+--- pixman//pixman/pixman-private.h	2010-12-25 18:46:00.102841000 +0800
++++ Pixman.Loongson//pixman/pixman-private.h	2010-12-25 18:39:15.401808000 +0800
+@@ -493,6 +493,11 @@
+ pixman_implementation_t *
+ _pixman_implementation_create_fast_path (void);
+ 
++#ifdef USE_LS
++pixman_implementation_t *
++_pixman_implementation_create_ls (void);
++#endif
++
+ #ifdef USE_MMX
+ pixman_implementation_t *
+ _pixman_implementation_create_mmx (void);
+diff -urN pixman//pixman/primitive.h Pixman.Loongson//pixman/primitive.h
+--- pixman//pixman/primitive.h	1970-01-01 08:00:00.000000000 +0800
++++ Pixman.Loongson//pixman/primitive.h	2010-12-25 18:39:15.457084000 +0800
+@@ -0,0 +1,214 @@
++/*

++* MMX register usage protocal

++*	return result: f8 

++*	tmp immediate f12

++*	tmp register in primtive f14 f16 f18

++*	tmp register in pixman f0,f4,f6,f10,f20,f22,  

++*	globals in function f24, f26, f28,f30 

++* Exceptions for load and store: 

++*	load will specify dest FPR register

++*	store will specify src FPR register

++*       expand_alpha(_rev) implemented with GPR,  dest FPR as the 2nd parameter

++*

++* Special alert: don't use return result $f8 as input, it might be overwritten

++*/

++

++

++/*primitive macros */

++

++#define clobber "$8","$9","$f0","$f2","$f8",\

++	"$f12","$f14","$f16","$f18","$f20",\

++	"$f22","$f24","$f26","$f28","$f30"

++

++#define  DMTC1_IMM(regc1,imm) \

++	"dli $8, "#imm" \n\t" \

++	"dmtc1 $8, "#regc1" \n\t"

++

++#define  MTC1_IMM(regc1,imm) \

++	"li $8, "#imm" \n\t" \

++	"dmtc1 $8, "#regc1" \n\t"

++

++

++#define save_to(reg1)  "mov.d "#reg1", $f8 \n\t"

++#define zero(reg1)  "xor "#reg1","#reg1","#reg1" \n\t"

++

++#define load32(sp,reg1) \

++		"ulw $8, "#sp" \n\t" \

++		"dmtc1 $8, "#reg1" \n\t"

++

++#define load32a(sp,reg1) \

++		"lw $8, "#sp" \n\t" \

++		"dmtc1 $8, "#reg1" \n\t"

++

++#define load32r(sp,reg1)  \

++	"dmtc1 "#sp", "#reg1" \n\t"

++

++#define load64(sp,reg1) \

++		"uld $8, "#sp" \n\t" \

++		"dmtc1 $8, "#reg1" \n\t"

++

++#define load64a(sp,reg1) \

++		"ld $8, "#sp" \n\t" \

++		"dmtc1 $8, "#reg1" \n\t"

++

++

++#define store32(reg1,sp) \

++		"dmfc1 $8, "#reg1" \n\t" \

++		"usw $8, "#sp" \n\t"

++

++#define store32r(reg1,sp) \

++		"dmfc1 "#sp", "#reg1" \n\t"

++

++#define store32a(reg1,sp) \

++		"swc1 "#reg1", "#sp" \n\t" 

++

++#define store64(reg1,sp) \

++		"dmfc1 $8, "#reg1" \n\t" \

++		"usd $8, "#sp" \n\t"

++

++#define store64a(reg1,sp) \

++		"sdc1 "#reg1", "#sp" \n\t" 

++

++#define load8888(sp,reg1) \

++	load64(sp,reg1) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"punpcklbh "#reg1", "#reg1", $f12 \n\t" 

++

++#define load8888r(sp,reg1) \

++	load32r(sp,reg1) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"punpcklbh "#reg1", "#reg1", $f12 \n\t" 

++

++#define load8888a(sp,reg1) \

++	load64a(sp,reg1) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"punpcklbh "#reg1", "#reg1", $f12 \n\t" 

++

++#define load8888ah(sp,reg1) \

++	load64a(sp,reg1) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"punpckhbh "#reg1", "#reg1", $f12 \n\t" 

++	

++#define store8888(reg1,sp) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"packushb "#reg1", "#reg1", $f12 \n\t" \

++	store64(reg1,sp)

++

++#define store8888r(reg1,sp) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"packushb "#reg1", "#reg1", $f12 \n\t" \

++	store32r(reg1,sp)

++

++#define store8888a(reg1,sp) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"packushb "#reg1", "#reg1", $f12 \n\t" \

++	store64a(reg1,sp)

++

++#define pack8888(reg1,reg2) 	\

++	"packushb $f8, "#reg1","#reg2" \n\t"

++

++#define unpack8888(reg1,reg2) 	\

++	"punpcklbh $f8, "#reg1","#reg2" \n\t"

++

++

++#define negate(sreg,dreg) \

++	DMTC1_IMM($f12, 0x00ff00ff00ff00ff)\

++	"xor "#dreg", "#sreg", $f12 \n\t"

++

++#define pix_add(reg1,reg2) \

++	"paddusb $f8, "#reg1", "#reg2" \n\t"

++

++#define pix_multiply(reg1,reg2) \

++	"pmullh $f14, "#reg1", "#reg2" \n\t " \

++	DMTC1_IMM($f12, 0x0080008000800080) \

++	"paddush $f14, $f14, $f12 \n\t "\

++ 	MTC1_IMM($f12, 8) \

++	"psrlh $f16, $f14, $f12 \n\t" \

++	"paddush $f14, $f14, $f16 \n\t" \

++	"psrlh $f8, $f14, $f12 \n\t" 

++

++#define pix_add_mul(reg1,reg2,reg3,reg4) \
++	pix_multiply(reg1,reg2) \

++	"mov.d $f18, $f8 \n\t" \

++	pix_multiply(reg3,reg4) \

++	pix_add($f18,$f8)	

++

++#define expand_alpha(sreg,dreg) \

++                "dmfc1 $8, "#sreg" \n\t" \

++                "dsrl32 $8, $8, 16 \n\t" \

++                "dsll $9, $8, 16 \n\t" \

++                "or $8, $8, $9 \n\t" \

++                "dsll32 $9, $8, 0 \n\t" \

++                "or $8, $8, $9 \n\t" \

++                "dmtc1 $8, "#dreg" \n\t"

++

++#define expand_alpha_rev(sreg,dreg)\

++                "dmfc1 $8, "#sreg" \n\t" \

++                "dsll32 $8, $8, 16 \n\t" \

++                "dsrl32 $8, $8, 16 \n\t" \

++                "dsll $9, $8, 16 \n\t" \

++                "or $8, $8, $9 \n\t" \

++                "dsll32 $9, $8, 0 \n\t" \

++                "or $8, $8, $9 \n\t" \

++                "dmtc1 $8, "#dreg" \n\t"

++

++#define expand8888(reg1,pos) expand8888_##pos(reg1)

++

++#define expand8888_0(reg1) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"punpcklbh $f8, "#reg1", $f12 \n\t" 

++

++#define expand8888_1(reg1) \

++	"xor $f12, $f12, $f12 \n\t" \

++	"punpckhbh $f8, "#reg1", $f12 \n\t" 

++

++#define expandx888(reg1,pos) \

++	expand8888(reg1,pos) \

++	DMTC1_IMM($f12, 0x00ff000000000000) \

++	"or $f8, $f8, $f12 \n\t"

++

++#define invert_colors(reg1)  \

++	DMTC1_IMM($f12, 0xffff0000ffff0000) \

++	"and $f14, "#reg1", $f12 \n\t" \

++	DMTC1_IMM($f12, 0x000000000000ffff) \

++	"and $f16, "#reg1", $f12 \n\t" \

++	DMTC1_IMM($f12, 0x0000ffff00000000) \

++	"and $f18, "#reg1", $f12 \n\t" \

++	MTC1_IMM($f12, 32) \

++	"dsll $f16, $f16, $f12 \n\t" \

++	"dsrl $f18, $f18, $f12 \n\t" \

++	"or $f14, $f14, $f16 \n\t" \

++	"or $f8, $f14, $f18 \n\t" 

++

++#define over(reg1,reg2,reg3) \

++	negate(reg2,$f8) \

++	pix_multiply(reg3, $f8)\

++	pix_add(reg1, $f8) 

++

++

++#define over_rev_non_pre(reg1,reg2) \

++	expand_alpha(reg1,$f0) \

++	DMTC1_IMM($f12,0x00ff000000000000) \

++	"or $f2, $f0, $f12 \n\t" \

++	invert_colors(reg1) \

++	pix_multiply($f8,$f2) \

++	save_to($f2) \

++	over($f2, $f0, reg2)

++

++#define in(reg1,reg2) pix_multiply(reg1,reg2) 

++

++#define in_over_full_src_alpha(reg1,reg2,reg3) \

++	DMTC1_IMM($f12,0x00ff000000000000) \

++	"or $f0, "#reg1", $f12 \n\t" \

++	in($f0,reg2) \

++	save_to($f0) \

++	over($f0,reg2,reg3)

++

++#define in_over(reg1,reg2,reg3,reg4) \

++	in(reg1,reg3) \

++	"mov.d $f0, $f8 \n\t" \

++	pix_multiply(reg2,reg3) \

++	"mov.d $f2, $f8 \n\t" \

++	over($f0,$f2,reg4)

++

++

diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index cd8d4f347..099938aa2 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=plotutils
 pkgver=2.6
 pkgrel=1
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
 license=("GPL")
diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD
index c4ec4e892..2ef5e2208 100644
--- a/extra/pm-utils/PKGBUILD
+++ b/extra/pm-utils/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=pm-utils
 pkgver=1.4.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Utilities and scripts for suspend and hibernate power management"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pm-utils.freedesktop.org"
 license=('GPL')
 depends=('bash' 'procps' 'pm-quirks')
diff --git a/extra/pmount/PKGBUILD b/extra/pmount/PKGBUILD
index bbdb957e7..908d7acdd 100644
--- a/extra/pmount/PKGBUILD
+++ b/extra/pmount/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pmount
 pkgver=0.9.23
 pkgrel=2
 pkgdesc="mount removable devices as normal user"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://pmount.alioth.debian.org/"
 backup=('etc/pmount.allow')
diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD
index cbd405df2..585d1008a 100644
--- a/extra/polkit-gnome/PKGBUILD
+++ b/extra/polkit-gnome/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=polkit-gnome
 pkgver=0.105
 pkgrel=1
 pkgdesc="PolicyKit integration for the GNOME desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
 license=('LGPL')
 depends=('polkit' 'gtk3')
diff --git a/extra/polkit-kde/PKGBUILD b/extra/polkit-kde/PKGBUILD
index 0a576e888..50a5da63a 100644
--- a/extra/polkit-kde/PKGBUILD
+++ b/extra/polkit-kde/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=polkit-kde
 pkgver=0.99.0
 pkgrel=2
 pkgdesc='Daemon providing a polkit authentication UI for KDE'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1'
 license=('GPL')
 depends=('kdelibs')
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index 82f5801b6..f2494ddc3 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=polkit-qt
 pkgver=0.103.0
 pkgrel=1
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
 license=('LGPL')
 depends=('polkit' 'qt')
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index dcf96039e..60db8e35f 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=polkit
 pkgver=0.103
 pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
 depends=('glib2' 'pam' 'expat')
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index bda699447..3536a1d31 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -5,9 +5,9 @@ pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.18.3
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'libtool')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index ab2ffd7bc..c5dbb9e31 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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" \
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index 9d70a4705..5bd0c1e83 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=9.0.6
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
 depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 302e0a967..d5561089e 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.1.2
 _majorver=${pkgver%.*}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
 makedepends=('libxml2' 'python2' 'perl' 'openssl>=1.0.0')
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index e628b9b0c..751780b31 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.10
 pkgrel=1
 pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)'
 url='http://potrace.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('zlib')
 options=('!libtool')
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
index 793db4535..b5c38eb1e 100644
--- a/extra/prison/PKGBUILD
+++ b/extra/prison/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=prison
 pkgver=1.0
 pkgrel=1
 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('qt' 'libdmtx' 'qrencode')
diff --git a/extra/procmail/PKGBUILD b/extra/procmail/PKGBUILD
index 4fe479094..1a43183d9 100644
--- a/extra/procmail/PKGBUILD
+++ b/extra/procmail/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=procmail
 pkgver=3.22
 pkgrel=4
 pkgdesc="Highly configurable auto mail processing."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.procmail.org"
 license=('GPL' 'custom:Artistic')
 depends=('glibc' 'sh')
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 86d1bce67..c510b4659 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.3.4a
 pkgrel=2
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.proftpd.org"
 license=('GPL')
 depends=('libldap' 'libmysqlclient' 'postgresql-libs')
diff --git a/extra/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD
index 7d4cb1baa..443e4a6c8 100644
--- a/extra/progsreiserfs/PKGBUILD
+++ b/extra/progsreiserfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=progsreiserfs
 pkgver=0.3.0.5
 pkgrel=7
 pkgdesc="library for accessing and manipulating reiserfs partitions"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.namesys.com"
 license=('GPL')
 depends=('e2fsprogs')
diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD
index d8769aed9..a283c95ae 100644
--- a/extra/psi/PKGBUILD
+++ b/extra/psi/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=5
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
 install='psi.install'
 source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index dff1ba5b2..fe7c7030f 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=psiconv
 pkgver=0.9.8
 pkgrel=9
 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://software.frodo.looijaard.name/psiconv/"
 license=('GPL')
 depends=('imagemagick')
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 32396dba4..f2b8e5299 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pstoedit
 pkgver=3.60
 pkgrel=2
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 url="http://www.pstoedit.net/"
 license=('GPL')
 depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
diff --git a/extra/pth/PKGBUILD b/extra/pth/PKGBUILD
index 7e2e6e5ee..b7da5145a 100644
--- a/extra/pth/PKGBUILD
+++ b/extra/pth/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pth
 pkgver=2.0.7
 pkgrel=4
 pkgdesc="The GNU Portable Threads."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/pth/"
 license=('LGPL')
 depends=('glibc' 'awk')
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index c87a281b3..26fe24ab7 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ptlib
 pkgver=2.10.2
 pkgrel=1
 pkgdesc="Portable Windows Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.ekiga.org/"
 license=('GPL')
 depends=('gcc-libs' 'openssl' 'alsa-lib' 'sdl' 'expat' 'libpulse' 'v4l-utils')
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 47ce4369e..a380da235 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -8,13 +8,14 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=1.1
-pkgrel=2
-arch=(i686 x86_64)
+pkgrel=1
+arch=(i686 x86_64 mips64el)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core avahi bluez gconf intltool jack
-             lirc-utils openssl fftw orc json-c gtk2)
+             speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
+             openssl fftw orc json-c gtk2)
+[ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils)
 options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
         $pkgbase.xinit)
@@ -47,9 +48,9 @@ package_pulseaudio() {
               'bluez: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
               'jack: jack support'
-              'lirc-utils: infra-red support'
               'openssl: RAOP support'
               'python2-pyqt: Equalizer GUI (qpaeq)')
+[ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
 
@@ -70,7 +71,7 @@ package_pulseaudio() {
       -i "$pkgdir/etc/pulse/default.pa"
 
   # Python fix
-  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
+  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" || true
 
   install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
 
diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD
index 30f9b0ab5..4eeff18a7 100644
--- a/extra/purple-plugin-pack/PKGBUILD
+++ b/extra/purple-plugin-pack/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=purple-plugin-pack
 pkgver=2.7.0
 pkgrel=1
 pkgdesc="Compilation of plugins for the libpurple family of IM clients"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://www.guifications.org/projects/purple-plugin-pack"
 license=('GPL')
 depends=('libpurple')
diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD
index 5a6f2f536..c8fe95255 100644
--- a/extra/putty/PKGBUILD
+++ b/extra/putty/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=putty
 pkgver=0.62
 pkgrel=1
 pkgdesc="A terminal integrated SSH/Telnet client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
 license=('MIT')
 depends=('gtk2')
diff --git a/extra/pwgen/PKGBUILD b/extra/pwgen/PKGBUILD
index 0f9327fe5..bc7dc14c4 100644
--- a/extra/pwgen/PKGBUILD
+++ b/extra/pwgen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pwgen
 pkgver=2.06
 pkgrel=2
 pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/pwgen/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD
index 6053b3214..deabdd2d3 100644
--- a/extra/pyalpm/PKGBUILD
+++ b/extra/pyalpm/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pyalpm
 pkgver=0.5.3
 pkgrel=1
 pkgdesc="Libalpm bindings for Python 3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/users/remy/pyalpm.git/"
 license=('GPL')
 depends=('python>=3.2' 'pacman>=4')
diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD
index fba0c5d51..1f15d7b14 100644
--- a/extra/pycrypto/PKGBUILD
+++ b/extra/pycrypto/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pycrypto
 pkgver=2.3
 pkgrel=1
 pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('python2')
 url="http://www.dlitz.net/software/pycrypto/"
 license=(custom)
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index 22f6911f0..b6113fd99 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.9.60
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
 url="http://cyberelk.net/tim/software/pycups/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libcups' 'python2')
 source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc})
diff --git a/extra/pygobject/fix-pycairo-capi-declaration.patch b/extra/pygobject/fix-pycairo-capi-declaration.patch
new file mode 100644
index 000000000..1f0364c7a
--- /dev/null
+++ b/extra/pygobject/fix-pycairo-capi-declaration.patch
@@ -0,0 +1,17 @@
+--- pygobject-2.28.4.orig/gi/pygi-foreign-cairo.c	2011-04-18 17:36:47.000000000 +0200
++++ pygobject-2.28.4/gi/pygi-foreign-cairo.c	2011-06-21 20:05:11.015628222 +0200
+@@ -26,12 +26,12 @@
+ 
+ #if PY_VERSION_HEX < 0x03000000
+ #include <pycairo.h>
++static Pycairo_CAPI_t *Pycairo_CAPI;
+ #else
+ #include <pycairo/py3cairo.h>
++#define Pycairo_IMPORT import_cairo()
+ #endif
+ 
+-Pycairo_CAPI_t *Pycairo_CAPI;
+-
+ #include "pygi-foreign.h"
+ 
+ #include <pyglib-python-compat.h>
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index aef58044c..a66600d53 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=('LGPL')
 makedepends=('python' 'python2')
diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD
index da57d172a..792c64878 100644
--- a/extra/pygtk/PKGBUILD
+++ b/extra/pygtk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pygtk
 pkgver=2.24.0
 pkgrel=2
 pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libglade' 'python2-cairo' 'pygobject')
 makedepends=('python2-numpy' 'pygobject2-devel')
diff --git a/extra/pygtksourceview2/PKGBUILD b/extra/pygtksourceview2/PKGBUILD
index b5e11dcdf..32955891d 100644
--- a/extra/pygtksourceview2/PKGBUILD
+++ b/extra/pygtksourceview2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pygtksourceview2
 pkgver=2.10.1
 pkgrel=3
 pkgdesc="Python bindings for gtksourceview2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/pymad/PKGBUILD b/extra/pymad/PKGBUILD
index 7b552f30e..768180463 100644
--- a/extra/pymad/PKGBUILD
+++ b/extra/pymad/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pymad
 pkgver=0.6
 pkgrel=3
 pkgdesc="Python interface to libmad."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.spacepants.org/src/pymad/"
 license=('LGPL')
 depends=('libmad' 'python2')
diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD
index 827aed0d8..b24f162b7 100644
--- a/extra/pyopenssl/PKGBUILD
+++ b/extra/pyopenssl/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=pyopenssl
 pkgname=('pyopenssl' 'python2-pyopenssl')
 pkgver=0.13
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/pyOpenSSL"
 license=('LGPL2.1')
 makedepends=('python' 'python2' 'openssl')
diff --git a/extra/pyorbit/PKGBUILD b/extra/pyorbit/PKGBUILD
index 930dd0dda..ab194f48b 100644
--- a/extra/pyorbit/PKGBUILD
+++ b/extra/pyorbit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pyorbit
 pkgver=2.24.0
 pkgrel=3
 pkgdesc="Python bindings for ORBit2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://www.pygtk.org"
 depends=('python2' 'orbit2>=2.14.16')
diff --git a/extra/pypgsql/PKGBUILD b/extra/pypgsql/PKGBUILD
index ef62e81c9..f716a4ca3 100644
--- a/extra/pypgsql/PKGBUILD
+++ b/extra/pypgsql/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pypgsql
 pkgver=2.5.1
 pkgrel=7
 pkgdesc="A python client library for postgresql"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://pypgsql.sourceforge.net/"
 depends=('python-egenix-mx-base>=2.0.6-3' 'postgresql-libs>=8.4')
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index a0510e30d..e44555352 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
 pkgver=4.9
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD
index 3864697f8..ff5c6b82e 100644
--- a/extra/pysmbc/PKGBUILD
+++ b/extra/pysmbc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pysmbc
 pkgver=1.0.11.1
 pkgrel=1
 pkgdesc="Python bindings for libsmbclient"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/pysmbc/"
 license=('GPL')
 depends=('python2' 'smbclient')
diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD
index 458bfca4d..116763cc8 100644
--- a/extra/python-cairo/PKGBUILD
+++ b/extra/python-cairo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-cairo
 pkgver=1.10.0
 pkgrel=1
 pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL3')
 depends=('python' 'cairo')
 makedepends=('pkg-config')
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index bcd412b82..6f9ca8e29 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -7,7 +7,7 @@ _origname=egenix-mx-base
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="A collection of Python tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.egenix.com/products/python/mxBase/"
 depends=('python2')
diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index 2a5fe156e..b43e0d82b 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-geoip
 pkgver=1.2.7
 pkgrel=1
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.maxmind.com/app/python"
 license=('LGPL')
 depends=('python2' 'geoip')
diff --git a/extra/python-imaging/PKGBUILD b/extra/python-imaging/PKGBUILD
index 01c745f00..3493f7e80 100644
--- a/extra/python-imaging/PKGBUILD
+++ b/extra/python-imaging/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python-imaging
 pkgver=1.1.7
 pkgrel=4
 pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pythonware.com/products/pil/index.htm"
 license=('custom:"pil"')
 depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 83019f82e..6a4f0c260 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=python-iwscan
 pkgver=20090609
 pkgrel=2
 pkgdesc="A Python interface to iwlist, using the iwlib library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.otaku42.de/browser/python-iwscan"
 license=('LGPL')
 depends=('python2' 'wireless_tools')
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index ab30abd27..50653df35 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=python-lxml
 pkgver=2.3.3
 pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 depends=('python2' 'libxslt')
diff --git a/extra/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD
index 010da5c82..9af824956 100644
--- a/extra/python-m2crypto/PKGBUILD
+++ b/extra/python-m2crypto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python-m2crypto
 pkgver=0.21.1
 pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
 license=('BSD')
 depends=('python2' 'openssl')
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index 68dbabc7e..ca5cfcea0 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('python-markupsafe' 'python2-markupsafe')
 pkgver=0.15
 pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
 makedepends=('python-distribute' 'python2-distribute')
diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD
index efb98fd88..87f2ed93c 100644
--- a/extra/python-notify/PKGBUILD
+++ b/extra/python-notify/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=python-notify
 pkgver=0.1.1
 pkgrel=10
 pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.galago-project.org/"
 license=('GPL')
 depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 81c6953e0..f981fe205 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.6.1
 pkgrel=1
 pkgdesc="Scientific tools for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://numpy.scipy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
index a60dc046a..03e45dc17 100644
--- a/extra/python-pycurl/PKGBUILD
+++ b/extra/python-pycurl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python-pycurl
 pkgver=7.19.0
 pkgrel=5
 pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pycurl.sourceforge.net"
 license=('GPL')
 depends=('python2' 'curl')
diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD
index a3447b7ce..2843920bc 100644
--- a/extra/python-pygame/PKGBUILD
+++ b/extra/python-pygame/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=python-pygame
 pkgver=1.9.1
 pkgrel=3
 pkgdesc="Python game library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygame.org/"
 license=('LGPL')
 depends=('python2' 'sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
diff --git a/extra/python-pyspi/PKGBUILD b/extra/python-pyspi/PKGBUILD
index ef5c18be6..85274a843 100644
--- a/extra/python-pyspi/PKGBUILD
+++ b/extra/python-pyspi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python-pyspi
 pkgver=0.6.1
 pkgrel=4
 pkgdesc="Python AT-SPI bindings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://people.redhat.com/zcerza/dogtail"
 license=('LGPL')
 depends=('python2' 'at-spi>=1.7.12')
diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD
index d8cdd75a8..423f84915 100644
--- a/extra/python-pysqlite/PKGBUILD
+++ b/extra/python-pysqlite/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.6.3
 pkgrel=1
 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pysqlite/"
 depends=('python2' 'sqlite3')
 replaces=('pysqlite2')
diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD
index 13fde3c16..828b9ed7f 100644
--- a/extra/python-telepathy/PKGBUILD
+++ b/extra/python-telepathy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python-telepathy
 pkgver=0.15.19
 pkgrel=1
 pkgdesc="Python libraries for use in Telepathy clients and connection managers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 license=('LGPL')
 depends=('dbus-python')
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index 62d10dd84..08fec228f 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.0.1
 pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2-distribute' 'python-distribute')
 url="http://excess.org/urwid/"
 source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
diff --git a/extra/python-wpactrl/PKGBUILD b/extra/python-wpactrl/PKGBUILD
index 0f3f9b84c..706ad8331 100644
--- a/extra/python-wpactrl/PKGBUILD
+++ b/extra/python-wpactrl/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=python-wpactrl
 pkgver=20090609
 pkgrel=2
 pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
 license=('GPL2')
 depends=('python2')
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index d96900b36..0588647ac 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -6,13 +6,16 @@
 pkgname=python
 pkgver=3.2.2
 pkgrel=2
+pkgrel=1 #holdver
 _pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
 makedepends=('tk' 'sqlite3' 'valgrind')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('tk' 'sqlite3')
 optdepends=('tk: for tkinter' 'sqlite3')
 provides=('python3')
 replaces=('python3')
@@ -38,6 +41,19 @@ build() {
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
+
+  if [ "$CARCH" = "mips64el" ]; then
+  ./configure --prefix=/usr \
+              --enable-shared \
+              --with-threads \
+              --with-computed-gotos \
+              --enable-ipv6 \
+              --without-valgrind \
+              --with-wide-unicode \
+              --with-system-expat \
+              --with-dbmliborder=gdbm:ndbm \
+              --with-system-ffi
+  else
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -48,6 +64,7 @@ build() {
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
               --with-system-ffi
+  fi
 
   make
 }
diff --git a/extra/python2-cairo/PKGBUILD b/extra/python2-cairo/PKGBUILD
index 0f2fb1462..5629199d2 100644
--- a/extra/python2-cairo/PKGBUILD
+++ b/extra/python2-cairo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python2-cairo
 pkgver=1.10.0
 pkgrel=1
 pkgdesc="Python2 bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'MPL')
 depends=('python2' 'cairo')
 options=('!libtool')
diff --git a/extra/pywebkitgtk/PKGBUILD b/extra/pywebkitgtk/PKGBUILD
index df78ea739..7aa9a5f2e 100644
--- a/extra/pywebkitgtk/PKGBUILD
+++ b/extra/pywebkitgtk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pywebkitgtk
 pkgver=1.1.8
 pkgrel=1
 pkgdesc="Python bindings to the WebKit GTK+ port"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pywebkitgtk/"
 license=('LGPL')
 depends=('libwebkit' 'pygtk')
diff --git a/extra/pyxml/PKGBUILD b/extra/pyxml/PKGBUILD
index eea70cc62..2474ca9c4 100644
--- a/extra/pyxml/PKGBUILD
+++ b/extra/pyxml/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pyxml
 pkgver=0.8.4
 pkgrel=8
 pkgdesc="Python XML parsing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/pyxml/"
 license=('custom')
 depends=('python2')
diff --git a/extra/qalculate-gtk/PKGBUILD b/extra/qalculate-gtk/PKGBUILD
index 9eb48dcaf..56092e7b3 100644
--- a/extra/qalculate-gtk/PKGBUILD
+++ b/extra/qalculate-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qalculate-gtk
 pkgver=0.9.7
 pkgrel=2
 pkgdesc="GNOME frontend for libqalculate"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qalculate.sourceforge.net/"
 license=('GPL')
 depends=('libqalculate' 'libgnome' 'libglade' 'cln')
diff --git a/extra/qalculate-kde/PKGBUILD b/extra/qalculate-kde/PKGBUILD
index 1b8a372a1..011fc36d0 100644
--- a/extra/qalculate-kde/PKGBUILD
+++ b/extra/qalculate-kde/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qalculate-kde
 pkgver=0.9.7
 pkgrel=2
 pkgdesc="KDE frontend for libqalculate"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qalculate.sourceforge.net/"
 license=('GPL')
 depends=('libqalculate' 'kdelibs3' 'cln')
diff --git a/extra/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD
index 376cf31df..cbe885624 100644
--- a/extra/qca-gnupg/PKGBUILD
+++ b/extra/qca-gnupg/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.0
 _pkgver=2.0.0-beta3
 pkgrel=2
 pkgdesc="Qt Cryptographic Architecture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 depends=('qca')
diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD
index 700e8a634..91fb1bbf4 100644
--- a/extra/qca-ossl/PKGBUILD
+++ b/extra/qca-ossl/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.0.0
 _pkgver=2.0.0-beta3
 pkgrel=3
 pkgdesc="Qt Cryptographic Architecture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 depends=('qca')
diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD
index 41b8aeba9..2cf9184ce 100644
--- a/extra/qca/PKGBUILD
+++ b/extra/qca/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qca
 pkgver=2.0.3
 pkgrel=1
 pkgdesc="Qt Cryptographic Architecture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 depends=('qt' 'ca-certificates')
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index f1d7baaae..338395870 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=qemu-kvm
 pkgver=1.0
 pkgrel=2
 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)
+arch=(i686 x86_64 'mips64el')
 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')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index f82f81201..b3762f986 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=qemu
 pkgver=1.0
 pkgrel=2
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2')
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index ebd94380f..06e1abf86 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=qhull
 pkgver=2010.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A general dimension code for computing convex hulls and related structures"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qhull.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD
index abced8b9a..cbd63771f 100644
--- a/extra/qimageblitz/PKGBUILD
+++ b/extra/qimageblitz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qimageblitz
 pkgver=0.0.6
 pkgrel=2
 pkgdesc="A graphical effect and filter library for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org/"
 license=('GPL2')
 depends=('qt')
@@ -18,6 +18,7 @@ build() {
   cd "${srcdir}"
   mkdir build
   cd build
+  CXX="g++" \
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr 
diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD
index fc98e1dc2..94505ed1d 100644
--- a/extra/qiv/PKGBUILD
+++ b/extra/qiv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qiv
 pkgver=2.2.4
 pkgrel=1
 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://spiegl.de/qiv/"
 license=('GPL2')
 depends=('file' 'gtk2' 'imlib2')
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index 1c28b8ae8..d44e3bd72 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.3.8
 pkgrel=1
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('jack' 'qt')
 options=('!makeflags')
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index 61ca3a799..eb1633e8e 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qjson
 pkgver=0.7.1
 pkgrel=2
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://qjson.sourceforge.net"
 depends=('qt')
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index a57ce304e..617435a47 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qrencode
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('libpng>=1.4.0')
 makedepends=(sdl)
 url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index c7c37e755..47e381721 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
 pkgver=2.6
 pkgrel=2
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'chrpath')
 source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index 56524dc94..72171d726 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qsynth
 pkgver=0.3.6
 pkgrel=1
 pkgdesc="Qt GUI for FluidSynth"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qsynth.sourceforge.net/"
 license=('GPL')
 depends=('fluidsynth' 'qt')
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index 49fa9f0f2..e19e19418 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.6.3
 pkgrel=1
 pkgdesk="compat version of Qt Assistant"
 url="http://qt.nokia.com/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 depends=('qt')
 source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 2edcd2cea..b2fd9eac9 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
 makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
@@ -30,6 +30,8 @@ build() {
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
+  [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive"
+
   sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
   sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index c0e85d265..b70ce9348 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qt3
 pkgver=3.3.8
 pkgrel=21
 pkgdesc="The QT3 gui toolkit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.trolltech.com/products/qt/index.html"
 license=('GPL')
 depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
index cd5e3cfce..93e1e3106 100644
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ b/extra/qtcurve-gtk2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qtcurve-gtk2
 pkgver=1.8.12
 pkgrel=1
 pkgdesc="A configurable set of widget styles for KDE and Gtk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-look.org/content/show.php?content=40492"
 license=('GPL')
 depends=('gtk2')
diff --git a/extra/qtcurve-kde3/PKGBUILD b/extra/qtcurve-kde3/PKGBUILD
index 9aeadda41..a916c64ad 100644
--- a/extra/qtcurve-kde3/PKGBUILD
+++ b/extra/qtcurve-kde3/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qtcurve-kde3
 pkgver=1.8.5
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('qtcurve')
 license=('GPL')
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD
index cf5716603..cb31d7040 100644
--- a/extra/qtcurve-kde4/PKGBUILD
+++ b/extra/qtcurve-kde4/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qtcurve-kde4
 pkgver=1.8.9
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('qtcurve')
 license=('GPL')
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index 41c84d82a..1bb6ad272 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=qtiplot
 pkgver=0.9.8.8
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index 328e6d28e..72187c991 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qtscriptgenerator
 pkgver=0.1.0
 pkgrel=5
 pkgdesc="A tool that generates Qt bindings for Qt Script"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="https://code.google.com/p/qtscriptgenerator/"
 license=('GPL')
 depends=('qt' 'phonon' 'qtwebkit')
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index c0c13dd98..d9a10d3f3 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qtwebkit
 pkgver=2.2.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD
index 769dbc020..96e5e179d 100644
--- a/extra/quodlibet/PKGBUILD
+++ b/extra/quodlibet/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=quodlibet
 pkgver=2.3.2
 pkgrel=1
 pkgdesc="An audio player written in pygtk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://code.google.com/p/quodlibet/"
 depends=('gstreamer0.10-python' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index 79bb209a4..02cd679dd 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=quota-tools
 pkgver=4.00_pre1 
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Tools to manage kernel-level quotas in Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/linuxquota/"
 license=('GPL' 'BSD')
 depends=('e2fsprogs')
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index 4eac3c05c..3b7c111bb 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qwt
 pkgver=6.0.1
 pkgrel=1
 pkgdesc="Qt Widgets for Technical Applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qwt.sourceforge.net/"
 depends=('qt')
 options=('!makeflags')
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index b72402f4a..5d9fd6df2 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qwtplot3d
 pkgver=0.2.7
 pkgrel=4
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
 depends=('qt' 'qwt' 'mesa')
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 25103ab3b..0078dbeaf 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=r
 pkgver=2.14.0
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 0b203d599..d978a1808 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=racket
 pkgver=5.2
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://racket-lang.org/"
 license=('LGPL')
 depends=('gtk2' 'desktop-file-utils')
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 62a6a6e50..3bd747b37 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=raptor
 pkgver=2.0.6
 pkgrel=1
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
 depends=('curl>=7.22.0' 'libxslt>=1.1.26')
 license=('LGPL')
diff --git a/extra/raptor1/PKGBUILD b/extra/raptor1/PKGBUILD
index 2f579874c..085809cc9 100644
--- a/extra/raptor1/PKGBUILD
+++ b/extra/raptor1/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=raptor1
 pkgver=1.4.21
 pkgrel=4
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
 depends=('curl' 'libxslt')
 license=('LGPL')
diff --git a/extra/rarian/PKGBUILD b/extra/rarian/PKGBUILD
index f6ddb58b0..612a21490 100644
--- a/extra/rarian/PKGBUILD
+++ b/extra/rarian/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rarian
 pkgver=0.8.1
 pkgrel=2
 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rarian.freedesktop.org/"
 license=('GPL')
 depends=('gcc-libs')
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index 8a482fb92..5e58afc6f 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
 url="http://librdf.org/rasqal"
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('raptor>=2.0.3' 'mpfr')
 options=('!libtool')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/ratpoison/PKGBUILD b/extra/ratpoison/PKGBUILD
index fcea6c2ec..2d42ee67e 100644
--- a/extra/ratpoison/PKGBUILD
+++ b/extra/ratpoison/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ratpoison
 pkgver=1.4.5
 pkgrel=4
 pkgdesc="A simple keystroke-driven window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxinerama' 'readline' 'bash' 'perl' 'libxtst' 'libxft' 'texinfo')
 url="http://www.nongnu.org/ratpoison/"
diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD
index 87905b577..86da8cea2 100644
--- a/extra/razor/PKGBUILD
+++ b/extra/razor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=razor
 pkgver=2.84
 pkgrel=5
 pkgdesc="A distributed, collaborative, spam detection and filtering network"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://razor.sourceforge.net"
 license=('PerlArtistic')
 depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl>=5.14.0')
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index 814bd760d..63d22a943 100644
--- a/extra/rcs/PKGBUILD
+++ b/extra/rcs/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='Revision Control System: manages multiple revisions of files'
 url='http://www.gnu.org/software/rcs/'
 license=('GPL3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('6ba0c3ea2d170990214a26b323feaadb89bb4206')
 
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index d47f37bf7..6eaba1c09 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rdesktop
 pkgver=1.7.1
 pkgrel=2
 pkgdesc="An open source client for Windows Remote Desktop Services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rdesktop.org/"
 license=('GPL3')
 depends=('libx11' 'openssl' 'libao' 'libsamplerate')
diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD
index 92043c7a3..f50eaaf1a 100644
--- a/extra/re-alpine/PKGBUILD
+++ b/extra/re-alpine/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=re-alpine
 pkgver=2.02
 pkgrel=3
 pkgdesc="The continuation of the Alpine email client from University of Washington"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/re-alpine/"
 license=('APACHE')
 depends=('libldap' 'krb5')
diff --git a/extra/re2c/PKGBUILD b/extra/re2c/PKGBUILD
index 8b0d5be7a..7380b1d9a 100644
--- a/extra/re2c/PKGBUILD
+++ b/extra/re2c/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=re2c
 pkgver=0.13.5
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 pkgdesc="A tool for generating C-based recognizers from regular expressions"
 url="http://re2c.sourceforge.net/"
diff --git a/extra/recode/PKGBUILD b/extra/recode/PKGBUILD
index f95e08fde..5e5d4b5e9 100644
--- a/extra/recode/PKGBUILD
+++ b/extra/recode/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=recode
 pkgver=3.6
-pkgrel=6
+pkgrel=6.1
 pkgdesc="Converts files between various character sets and usages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://recode.progiciels-bpi.ca/index.html"
 license=('GPL' 'LGPL')
 depends=('glibc' 'texinfo')
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index 2b6db16bd..88da1207e 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.0.15
 pkgrel=3
 url="http://librdf.org/"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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}
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index c7fbd8446..562d2542d 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rest
 pkgver=0.7.12
 pkgrel=1
 pkgdesc="A helper library for RESTful services."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('GPL2')
 depends=('glib2' 'libxml2' 'libsoup-gnome')
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 35eb90993..0a06c738e 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rhythmbox
 pkgver=2.95
 pkgrel=1
 pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.rhythmbox.org"
 depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3'
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
index 187d12948..60d627f0f 100644
--- a/extra/ristretto/PKGBUILD
+++ b/extra/ristretto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ristretto
 pkgver=0.3.2
 pkgrel=1
 pkgdesc="A fast and lightweight picture-viewer for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/ristretto"
 license=('GPL')
 depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils')
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index f8cf3e311..bb080bc93 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=rosegarden
 pkgver=11.11
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD
index e8f231f4e..30d4e3554 100644
--- a/extra/rox/PKGBUILD
+++ b/extra/rox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rox
 pkgver=2.11
 pkgrel=1
 pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://roscidus.com/desktop/"
 depends=('sh' 'libsm' 'gtk2')
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 9e5a9dc9d..932710e88 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -5,11 +5,11 @@ pkgname=rrdtool
 pkgver=1.4.5
 pkgrel=4
 pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
 depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua' 'groff')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD
index 131c0ed16..cda6c45e4 100644
--- a/extra/rssh/PKGBUILD
+++ b/extra/rssh/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=rssh
 pkgver=2.3.3
 pkgrel=2
 pkgdesc='A restricted shell for use with OpenSSH, allowing only scp and/or sftp'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.pizzashack.org/rssh/'
 depends=('openssh' 'glibc')
 backup=('etc/rssh.conf')
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index afba29ff2..4805bafba 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rsync
 pkgver=3.0.9
 pkgrel=1
 pkgdesc="A file transfer program to keep remote files in sync"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://samba.anu.edu.au/rsync/"
 license=('GPL3')
 depends=('acl')
diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index 2a9ed84eb..2e1101561 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rtkit
 pkgver=0.10
 pkgrel=2
 pkgdesc="Realtime Policy and Watchdog Daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://git.0pointer.de/?p=rtkit.git"
 license=('GPL' 'custom:BSD')
 depends=('dbus' 'polkit')
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index b1e933a21..98318e7d2 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rtmpdump
 pkgver=2.4
 pkgrel=1
 pkgdesc="A tool to download rtmp streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rtmpdump.mplayerhq.hu/"
 license=('GPL2' 'LGPL2.1')
 depends=('openssl')
diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD
index f9506554d..526dd8f57 100644
--- a/extra/rubberband/PKGBUILD
+++ b/extra/rubberband/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rubberband
 pkgver=1.6.0
 pkgrel=2
 pkgdesc="Time-stretching and pitch-shifting audio library and utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.breakfastquay.com/rubberband/"
 license=('GPL')
 depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk')
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index c4786c331..8e060de53 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -9,10 +9,12 @@ 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')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ruby-lang.org/en/"
 license=('BSD' 'custom')
 makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
 sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
@@ -44,3 +46,6 @@ package_ruby-docs() {
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
 }
+md5sums=('096758c3e853b839dc980b183227b182')
+md5sums=('65401fb3194cdccd6c1175ab29b8fdb8')
+sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index 3d976c041..437bfec9d 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rxvt-unicode
 pkgver=9.15
 pkgrel=1
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
 license=('GPL')
 depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index cdaaf6e14..9592c0e52 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=3.6.1
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.1
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
 makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
diff --git a/extra/sane-frontends/PKGBUILD b/extra/sane-frontends/PKGBUILD
index 0389326dd..36a2b0721 100644
--- a/extra/sane-frontends/PKGBUILD
+++ b/extra/sane-frontends/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sane-frontends
 pkgver=1.0.14
 pkgrel=5
 pkgdesc="A set of frontends for SANE."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.sane-project.org"
 license=('GPL')
 depends=('sane' 'gimp' 'libjpeg>=7')
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 6d0d26c57..d1eda7ab0 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.0.22
 pkgrel=4
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
 makedepends=('texlive-latexextra')
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index f8551dc3f..29b5fc0a8 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -9,11 +9,13 @@ pkgver=1.0.54
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('clisp' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
@@ -39,7 +41,11 @@ build() {
   (disable :largefile)))
 EOF
 
-  sh make.sh sbcl
+  if [ "$CARCH" = "mips64el" ]; then
+    sh make.sh clisp
+  else
+    sh make.sh sbcl
+  fi
   make -C doc/manual info
 }
 
diff --git a/extra/sbcl/mips-arch.h.diff b/extra/sbcl/mips-arch.h.diff
new file mode 100644
index 000000000..4f593aa83
--- /dev/null
+++ b/extra/sbcl/mips-arch.h.diff
@@ -0,0 +1,20 @@
+--- sbcl-1.0.49.orig/src/runtime/mips-arch.h	2011-06-25 16:13:44.103101571 +0200
++++ sbcl-1.0.49/src/runtime/mips-arch.h	2011-06-25 16:14:31.279501569 +0200
+@@ -1,6 +1,8 @@
+ #ifndef _MIPS_ARCH_H
+ #define _MIPS_ARCH_H
+ 
++/* For lose. */
++#include "interr.h"
+ 
+ static inline void
+ get_spinlock(volatile lispobj *word, long value)
+@@ -31,7 +33,7 @@
+           [__new] "r" (value)
+         : "memory");
+ 
+-    if (!cmp)
++    if (!__cmp)
+         lose("recursive get_spinlock: 0x%x,%d\n", word, value);
+ #else /* LISP_FEATURE_SB_THREAD */
+     *word=value;
diff --git a/extra/schedtool/PKGBUILD b/extra/schedtool/PKGBUILD
index 345c96ce6..fb5bcfe88 100644
--- a/extra/schedtool/PKGBUILD
+++ b/extra/schedtool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=schedtool
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="Query or alter a process' scheduling policy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freequaos.host.sk/schedtool/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD
index 22fc3e9b2..856f3fec9 100644
--- a/extra/schroedinger/PKGBUILD
+++ b/extra/schroedinger/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=schroedinger
 pkgver=1.0.10
 pkgrel=1
 pkgdesc="An implemenation of the Dirac video codec in ANSI C code"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.diracvideo.org/"
 license=('GPL2' 'LGPL2' 'MPL' 'MIT')
 depends=('orc>=0.4.11')
diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD
index ba47b28a5..f7d4f22d9 100644
--- a/extra/scim-anthy/PKGBUILD
+++ b/extra/scim-anthy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.7
 pkgrel=2
 _filecode=37309
 pkgdesc='Japanese input method module for SCIM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.jp/projects/scim-imengine/'
 license=('GPL')
 depends=('scim' 'anthy')
diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD
index d9e6451b5..395288704 100644
--- a/extra/scim-chewing/PKGBUILD
+++ b/extra/scim-chewing/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=scim-chewing
 pkgver=0.3.4
 pkgrel=1
 pkgdesc='Traditional Chinese input method module for SCIM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://chewing.csie.net/'
 license=('GPL')
 depends=('scim' 'libchewing')
diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD
index 527151486..081538425 100644
--- a/extra/scim-hangul/PKGBUILD
+++ b/extra/scim-hangul/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scim-hangul
 pkgver=0.3.2
 pkgrel=4
 pkgdesc='Korean input method module for SCIM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.scim-im.org/'
 license=('GPL')
 depends=('libhangul' 'scim')
diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD
index 4fcb26155..9d643ef8b 100644
--- a/extra/scim-m17n/PKGBUILD
+++ b/extra/scim-m17n/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=scim-m17n
 pkgver=0.2.3
 pkgrel=3
 pkgdesc='Multilingual input method module for SCIM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.scim-im.org/'
 license=('GPL')
 depends=('scim' 'm17n-lib')
diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD
index 3f8e1e149..1a8220bbd 100644
--- a/extra/scim-pinyin/PKGBUILD
+++ b/extra/scim-pinyin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scim-pinyin
 pkgver=0.5.91
 pkgrel=5
 pkgdesc="Chinese 拼音 (PinYin) input for SCIM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scim-im.org/"
 license=GPL
 depends=('scim>=1.4.7')
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index ca35f2882..698a91d04 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=scim-tables
 pkgver=0.5.10
 pkgrel=1
 pkgdesc='Generic table input method module for SCIM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.scim-im.org/'
 license=('GPL')
 depends=('scim')
diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD
index b93293cf4..a7c9216f1 100644
--- a/extra/scim-uim/PKGBUILD
+++ b/extra/scim-uim/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=scim-uim
 pkgver=0.2.0
 pkgrel=4
 pkgdesc='UIM bridging input engine for SCIM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.scim-im.org/'
 license=('GPL')
 depends=('scim>=1.4.8' 'uim>=1.5.5')
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 924610761..e8a4224f7 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 makedepends=('intltool')
 depends=('gtk2' 'libtool')
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD
index c22d539c2..1c6224652 100644
--- a/extra/screen/PKGBUILD
+++ b/extra/screen/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=4.0.3
 pkgrel=12
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/screen/"
 license=('GPL')
 depends=('ncurses' 'pam')
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 5af43d7ed..d5fca5122 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=scribus
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scribus.net"
 license=('GPL')
 install=scribus.install
diff --git a/extra/scrot/PKGBUILD b/extra/scrot/PKGBUILD
index 84bca3aa8..6608526b1 100644
--- a/extra/scrot/PKGBUILD
+++ b/extra/scrot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=scrot
 pkgver=0.8
 pkgrel=5
 pkgdesc="A simple command-line screenshot utility for X"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://scrot.sourcearchive.com/"
 license=('MIT')
 depends=('giblib')
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index 2b45eb118..fbc77bd84 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scummvm
 pkgver=1.4.0
 pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.scummvm.org/"
 depends=('libmad' 'sdl' 'fluidsynth')
diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index b7e0c1b32..5a72f859e 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sdl_gfx
 pkgver=2.0.23
 pkgrel=1
 pkgdesc="SDL Graphic Primitives"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 options=(!libtool)
 url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD
index 7643e2ba8..37af1d8cb 100644
--- a/extra/sdl_image/PKGBUILD
+++ b/extra/sdl_image/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_image
 pkgver=1.2.12
 pkgrel=1
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib')
 options=('!libtool')
diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD
index 897875491..f5927cb59 100644
--- a/extra/sdl_mixer/PKGBUILD
+++ b/extra/sdl_mixer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=sdl_mixer
 pkgver=1.2.12
 pkgrel=1
 pkgdesc="A simple multi-channel audio mixer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org/projects/SDL_mixer/"
 license=('custom')
 depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg')
diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD
index 76605a50f..e0238ffcc 100644
--- a/extra/sdl_net/PKGBUILD
+++ b/extra/sdl_net/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_net
 pkgver=1.2.8
 pkgrel=1
 pkgdesc="A small sample cross-platform networking library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.libsdl.org/projects/SDL_net/"
 depends=('sdl')
diff --git a/extra/sdl_pango/PKGBUILD b/extra/sdl_pango/PKGBUILD
index 68b686aeb..2bda76f3a 100644
--- a/extra/sdl_pango/PKGBUILD
+++ b/extra/sdl_pango/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sdl_pango
 pkgver=0.1.2
 pkgrel=3
 pkgdesc="Pango SDL binding"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sdlpango.sourceforge.net/"
 license=('LGPL')
 depends=('pango' 'sdl')
diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD
index e33a1addd..4fee4c404 100644
--- a/extra/sdl_sound/PKGBUILD
+++ b/extra/sdl_sound/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sdl_sound
 pkgver=1.0.3
 pkgrel=3
 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/SDL_sound/"
 license=('LGPL')
 depends=('sdl' 'libmikmod' 'libvorbis' 'flac' 'speex' 'smpeg')
diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD
index 7aa5b252b..5e325a316 100644
--- a/extra/sdl_ttf/PKGBUILD
+++ b/extra/sdl_ttf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_ttf
 pkgver=2.0.11
 pkgrel=1
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.libsdl.org/projects/SDL_ttf/"
 depends=('sdl>=1.2.12' 'freetype2')
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 9d569b19e..1b06de270 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=seahorse
 pkgver=3.2.2
 pkgrel=2
 pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://projects.gnome.org/seahorse/"
 depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index 8b437560a..bc02377ba 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=seed
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Seed/"
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/setserial/PKGBUILD b/extra/setserial/PKGBUILD
index 590fa8003..d5a876d9a 100644
--- a/extra/setserial/PKGBUILD
+++ b/extra/setserial/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=setserial
 pkgver=2.17
 pkgrel=4
 pkgdesc="Allows to change various attributes of a serial device"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://setserial.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 7392bd2d6..4045950f3 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sg3_utils
 pkgver=1.33
 pkgrel=1
 pkgdesc="Generic SCSI utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sg.danny.cz/sg/sg3_utils.html"
 license=('GPL' 'custom:BSD')
 depends=('glibc')
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index 586cfb0f1..a40936e48 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=shared-mime-info
 pkgver=0.91
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Freedesktop.org Shared MIME Info"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index c04443584..4e61303ca 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Makes so-called shell archives out of many files'
 url='http://www.gnu.org/software/sharutils/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'gettext' 'texinfo')
 source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109')
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index fd047dc72..9b061a986 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=sip
 pkgname=('sip' 'python2-sip')
 pkgver=4.13.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
index 269f9b724..a2905c132 100644
--- a/extra/skanlite/PKGBUILD
+++ b/extra/skanlite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=skanlite
 pkgver=0.8
 pkgrel=1
 pkgdesc="Image Scanning Application for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kde-apps.org/content/show.php?content=109803'
 license=('GPL')
 depends=('kdebase-runtime' 'libksane')
diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index 6905293b6..12810e517 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slang
 pkgver=2.2.4
 pkgrel=1
 pkgdesc="S-Lang is a powerful interpreted language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jedsoft.org/slang/"
 license=('GPL')
 depends=('glibc' 'pcre' 'zlib')
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 6dea30917..1408a573f 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=slim
 pkgver=1.3.2
 pkgrel=6
 pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://slim.berlios.de/'
 license=('GPL2')
 depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
diff --git a/extra/slv2/PKGBUILD b/extra/slv2/PKGBUILD
index 3005cd313..d86c8a099 100644
--- a/extra/slv2/PKGBUILD
+++ b/extra/slv2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slv2
 pkgver=0.6.6
 pkgrel=6
 pkgdesc="Library for LV2 hosts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/slv2"
 license=('GPL')
 depends=('redland>=1.0.13' 'lv2core' 'jack')
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 158ee6bd1..e95df0362 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=3
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs' 'libcap-ng')
 backup=('etc/smartd.conf'
         'etc/conf.d/smartd')
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index d713ed926..82dc3183e 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=smb4k
 pkgver=0.10.90
 pkgrel=2
 pkgdesc="A KDE program that browses samba shares"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://smb4k.berlios.de/"
 license=('GPL')
 depends=('kdebase-runtime')
diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD
index 9503a1bae..276bc8990 100644
--- a/extra/smpeg/PKGBUILD
+++ b/extra/smpeg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=smpeg
 pkgver=0.4.4
 pkgrel=6
 pkgdesc="SDL MPEG Player Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/smpeg/"
 license=('LGPL')
 depends=('sdl')
diff --git a/extra/smplayer-themes/PKGBUILD b/extra/smplayer-themes/PKGBUILD
index 5f7be24bb..cef1d8118 100644
--- a/extra/smplayer-themes/PKGBUILD
+++ b/extra/smplayer-themes/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=smplayer-themes
 pkgver=0.1.20
 pkgrel=1
 pkgdesc="Themes for smplayer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
 depends=('smplayer')
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 3187681ea..3cc1ea230 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=smplayer
 pkgver=0.6.10
 pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'mplayer')
diff --git a/extra/snarf/PKGBUILD b/extra/snarf/PKGBUILD
index 591fd1a7c..5e1e7a8fc 100644
--- a/extra/snarf/PKGBUILD
+++ b/extra/snarf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=snarf
 pkgver=7.0
 pkgrel=4
 pkgdesc="Command-line URL retrieval tool (http/ftp/gopher)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.xach.com/snarf/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index ef3574080..7ae2be083 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=snd
 pkgver=12.5
 pkgrel=1
 pkgdesc="An advanced sound editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ccrma.stanford.edu/software/snd/"
 license=('custom')
 depends=('lesstif' 'jack' 'gamin' 'gsl' 'fftw')
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index cb421a6e3..4f1fe455e 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('readline' 'openssl')
 source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('32181b08aa91309ee368e1e36a2cb337eedc425a')
diff --git a/extra/sofia-sip/PKGBUILD b/extra/sofia-sip/PKGBUILD
index 74e54b92a..cb6cf1d73 100644
--- a/extra/sofia-sip/PKGBUILD
+++ b/extra/sofia-sip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sofia-sip
 pkgver=1.12.11
 pkgrel=1
 pkgdesc="An open-source SIP User-Agent library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sofia-sip.sourceforge.net"
 options=('!libtool' 'zipman')
 license=('LGPL')
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index 416352778..00fff2cbe 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sonata
 pkgver=1.6.2.1
 pkgrel=7
 pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sonata.berlios.de/"
 license=('GPL3')
 depends=('pygtk' 'python-mpd')
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index ec6525529..78a374c66 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -6,11 +6,12 @@ pkgname=soprano
 pkgver=2.7.4
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://soprano.sourceforge.net/'
 license=('GPL' 'LGPL')
 depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
+[ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('783fb07f9679f45e987aff7a17bef649')
 
@@ -18,6 +19,8 @@ build() {
   cd "${srcdir}"
   mkdir build
   cd build
+
+  [ "$CARCH" = "mips64el" ] || \
   . /etc/profile.d/openjdk6.sh
   # we need the rpath
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index ba2f50aee..131310350 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sound-juicer
 pkgver=2.32.1
 pkgrel=1
 pkgdesc="A cd ripper application"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('libmusicbrainz3' 'libgnome-media-profiles' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gnome-common' 'gtk-doc')
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index e27054573..afc37c358 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -5,29 +5,38 @@ pkgname=soundtouch
 pkgver=1.6.0
 pkgrel=1
 pkgdesc="An audio processing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.surina.net/soundtouch/"
 license=('LGPL')
 depends=('gcc-libs')
 options=('!libtool')
 source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
         soundtouch-1.4.0-mmx-sse-compile-fix.patch
+        soundtouch-1.4.0-x86_64-asm-broken.patch
+        disable-mmx.patch
         soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
-         '108cd080b4b0ebe8ed1f950ff1315e7a'
-         '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
-          '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
-          '95282cca856b3b8645fadb530ce5eb892074f193')
 
 build() {
   cd "${srcdir}/${pkgname}"
   patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
   patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
 
-  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  if [ "${CARCH}" = "mips64el" ]; then
+    patch -Np1 -i "${srcdir}/disable-mmx.patch"
+  fi
+
   ./bootstrap
-  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  case $CARCH in
+    i686)
+      ./configure --prefix=/usr --enable-shared
+      ;;
+    x86_64)
+      ./configure --prefix=/usr --enable-shared --with-pic
+      ;;
+    mips64el)
+      ./configure --prefix=/usr --enable-shared --with-pic
+      ;;
+  esac
   make
 }
 
diff --git a/extra/soundtouch/disable-mmx.patch b/extra/soundtouch/disable-mmx.patch
new file mode 100644
index 000000000..7be579c43
--- /dev/null
+++ b/extra/soundtouch/disable-mmx.patch
@@ -0,0 +1,36 @@
+--- soundtouch/source/SoundTouch/Makefile.in~	2011-07-04 15:26:59.621763536 -0300
++++ soundtouch/source/SoundTouch/Makefile.in	2011-07-04 15:27:29.404648895 -0300
+@@ -59,7 +59,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libSoundTouch_la_LIBADD =
+ am_libSoundTouch_la_OBJECTS = AAFilter.lo FIRFilter.lo \
+-	FIFOSampleBuffer.lo mmx_optimized.lo sse_optimized.lo \
++	FIFOSampleBuffer.lo \
+ 	RateTransposer.lo SoundTouch.lo TDStretch.lo \
+ 	cpu_detect_x86_gcc.lo BPMDetect.lo PeakFinder.lo
+ libSoundTouch_la_OBJECTS = $(am_libSoundTouch_la_OBJECTS)
+@@ -206,14 +206,12 @@ EXTRA_DIST = 3dnow_win.cpp cpu_detect_x8
+ noinst_HEADERS = AAFilter.h cpu_detect.h cpu_detect_x86_gcc.cpp FIRFilter.h RateTransposer.h TDStretch.h PeakFinder.h
+ lib_LTLIBRARIES = libSoundTouch.la
+ #
+-libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp BPMDetect.cpp PeakFinder.cpp
++libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp BPMDetect.cpp PeakFinder.cpp
+ 
+ # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
+ # fix this script to automatically check for CPU architecture, please submit a patch 
+ # to me.
+ AM_CXXFLAGS = -fcheck-new -I../../include
+-mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
+-sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -292,8 +290,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoundTouch.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TDStretch.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_detect_x86_gcc.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmx_optimized.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sse_optimized.Plo@am__quote@
+ 
+ .cpp.o:
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 64ab42751..be447b2ae 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=source-highlight
 pkgver=3.1.6
 pkgrel=1
 pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
 license=('GPL')
 depends=('gcc-libs' 'bash' 'boost-libs')
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 774654feb..a0e982625 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sox
 pkgver=14.3.2
 pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
 depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index 8228494e1..f2859dc20 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=spamassassin
 pkgver=3.3.2
 pkgrel=3
 pkgdesc="A mail filter to identify spam."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
 url="http://spamassassin.apache.org"
 depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
diff --git a/extra/spassgen/PKGBUILD b/extra/spassgen/PKGBUILD
index 653a51f57..858de7df2 100644
--- a/extra/spassgen/PKGBUILD
+++ b/extra/spassgen/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=spassgen
 pkgver=1.5
 pkgrel=7
 pkgdesc="A small program that generates passwords"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://spassgen.sourceforge.net/"
 license=('GPL2')
 depends=('qt3')
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index c0269f941..949f5123e 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=speech-dispatcher
 pkgver=0.7.1
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
 license=('GPL2' 'FDL')
diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD
index 7bf7e7b22..a3d004e85 100644
--- a/extra/speex/PKGBUILD
+++ b/extra/speex/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=speex
 pkgver=1.2rc1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A free codec for free speech"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.speex.org/"
 license=('BSD')
 depends=('libogg')
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index 47f2bf91a..f0a043b9e 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=squid
 pkgver=3.1.16
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A full-featured Web proxy cache server."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.squid-cache.org"
 depends=('openssl' 'pam' 'cron' 'perl' 'libtool')
 makedepends=('libcap>=2.16')
diff --git a/extra/srm/PKGBUILD b/extra/srm/PKGBUILD
index 3ca27ff05..1ca84e154 100644
--- a/extra/srm/PKGBUILD
+++ b/extra/srm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=srm
 pkgver=1.2.11
 pkgrel=2
 pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://srm.sourceforge.net/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/sshfs/PKGBUILD b/extra/sshfs/PKGBUILD
index 5feb4da37..f12852bee 100644
--- a/extra/sshfs/PKGBUILD
+++ b/extra/sshfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sshfs
 pkgver=2.3
 pkgrel=2
 pkgdesc="FUSE client based on the SSH File Transfer Protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fuse.sourceforge.net/sshfs.html"
 license=('GPL')
 depends=('fuse' 'glib2' 'openssh')
diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD
index 03b72606d..c6268ad4e 100644
--- a/extra/ssmtp/PKGBUILD
+++ b/extra/ssmtp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ssmtp
 pkgver=2.64
 pkgrel=2
 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/stable/mail/ssmtp"
 depends=('openssl')
diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD
index 8ce7a50e8..fe150edb8 100644
--- a/extra/stardict/PKGBUILD
+++ b/extra/stardict/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stardict
 pkgver=3.0.3
 pkgrel=1
 pkgdesc='International dictionary software'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.stardict.org/'
 license=('GPL')
 depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD
index 647b181c9..bec3abae5 100644
--- a/extra/startup-notification/PKGBUILD
+++ b/extra/startup-notification/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=startup-notification
 pkgver=0.12
 pkgrel=2
 pkgdesc="Monitor and display application startup"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libx11' 'xcb-util>=0.3.8')
 options=('!libtool')
diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD
index d32a60fc4..5ea251f2b 100644
--- a/extra/stellarium/PKGBUILD
+++ b/extra/stellarium/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stellarium
 pkgver=0.11.1
 pkgrel=1
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://stellarium.free.fr/"
 license=('GPL2')
 depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt' 'openssl')
diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD
index ab50710c8..3ccdc693e 100644
--- a/extra/strace/PKGBUILD
+++ b/extra/strace/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=strace
 pkgver=4.6
 pkgrel=2
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/strace/"
 license=('custom')
 depends=('perl')
diff --git a/extra/streamripper/PKGBUILD b/extra/streamripper/PKGBUILD
index 8cceccb06..52144364a 100644
--- a/extra/streamripper/PKGBUILD
+++ b/extra/streamripper/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=streamripper
 pkgver=1.64.6
 pkgrel=2
 pkgdesc="Records and splits streaming mp3 into tracks"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://streamripper.sourceforge.net"
 license=('GPL')
 depends=('glib2' 'libmad' 'faad2' 'libvorbis')
diff --git a/extra/streamtuner/PKGBUILD b/extra/streamtuner/PKGBUILD
index f449a3f89..07243483b 100644
--- a/extra/streamtuner/PKGBUILD
+++ b/extra/streamtuner/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=streamtuner
 pkgver=0.99.99
 pkgrel=11
 pkgdesc="A stream directory browser"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/streamtuner/"
 license=('custom')
 depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2')
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index ede7489cd..e6f83fd19 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=strigi
 pkgver=0.7.7
 pkgrel=1
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vandenoever.info/software/strigi/"
 license=('GPL2')
 depends=('exiv2' 'libxml2' 'boost-libs')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 11a474e99..f7df1e584 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -6,13 +6,16 @@ pkgname=subversion
 pkgver=1.7.2
 pkgrel=2
 pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig'
+             'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
@@ -33,10 +36,19 @@ build() {
    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
+   autoreconf
+   if [ "$CARCH" = "mips64el" ]; then
+   ./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.2 \
+               --with-gnome-keyring --with-kwallet
+   else
    ./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
+   fi
 
    make external-all
    make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
diff --git a/extra/sweep/PKGBUILD b/extra/sweep/PKGBUILD
index 0cc3698c7..e4c38ba27 100644
--- a/extra/sweep/PKGBUILD
+++ b/extra/sweep/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sweep
 pkgver=0.9.3
 pkgrel=2
 pkgdesc="Sound editing and mixing program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.metadecks.org/software/sweep/"
 license=('GPL2')
 depends=('gtk2' 'libsamplerate' 'libmad' 'libvorbis' 'alsa-lib' 'speex')
diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD
index b51701d23..17f9a44ad 100644
--- a/extra/swh-plugins/PKGBUILD
+++ b/extra/swh-plugins/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=swh-plugins
 pkgver=0.4.15
 pkgrel=4
 pkgdesc="Steve Harris' LADSPA plug-ins suite"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://plugin.org.uk/"
 license=('GPL')
 depends=('fftw' 'ladspa')
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index f0f567729..24b3ea96f 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=swig
 pkgver=2.0.4
 pkgrel=2
 pkgdesc="Generate scripting interfaces to C/C++ code"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swig.org/"
 license=('custom')
 depends=('zlib' 'pcre')
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index e2e34ebd6..01ca0fe9e 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=3.7.1
 pkgrel=1
 pkgdesc="An open source widget toolkit for Java"
 _date=201109091335
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.eclipse.org/swt/"
 license=('EPL')
 depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD
index 76a376889..ebd117193 100644
--- a/extra/sysklogd/PKGBUILD
+++ b/extra/sysklogd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sysklogd
 pkgver=1.5
 pkgrel=3
 pkgdesc="System and kernel log daemons"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.infodrom.org/projects/sysklogd/"
 license=('GPL' 'BSD')
 depends=('glibc' 'logrotate')
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index b82990a84..083fc9414 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.3.7
 pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
 source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD
index 50d8a4c8e..cf9e754e0 100644
--- a/extra/t1lib/PKGBUILD
+++ b/extra/t1lib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=t1lib
 pkgver=5.1.2
 pkgrel=3
 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
 license=('GPL')
 depends=('libxaw')
diff --git a/extra/taglib-extras/PKGBUILD b/extra/taglib-extras/PKGBUILD
index 23080ec64..912406c06 100644
--- a/extra/taglib-extras/PKGBUILD
+++ b/extra/taglib-extras/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=taglib-extras
 pkgver=1.0.1
 pkgrel=2
 pkgdesc="Additional taglib plugins for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.kde.org/~wheeler/taglib.html"
 license=('LGPL')
 depends=('taglib>=1.6')
diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD
index bde9d495e..ad52b6bc0 100644
--- a/extra/taglib-sharp/PKGBUILD
+++ b/extra/taglib-sharp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=taglib-sharp
 pkgver=2.0.3.7
 pkgrel=1
 pkgdesc="Free and Open Source library for the .NET 2.0 and Mono frameworks which will let you tag your software with as much or as little detail as you like without slowing you down."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.taglib-sharp.com/Main_Page"
 license=('LGPL2')
 depends=('mono')
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index 00801f6f1..aaa8f869e 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=taglib
 pkgver=1.7
 pkgrel=3
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.kde.org/~wheeler/taglib.html"
 license=('GPL2')
 depends=('sh' 'zlib' 'gcc-libs')
diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD
index 573d162dd..cb853d253 100644
--- a/extra/talloc/PKGBUILD
+++ b/extra/talloc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=talloc
 pkgver=2.0.7
 pkgrel=1
 pkgdesc="A hierarchical pool based memory allocator with destructors"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://talloc.samba.org/"
 depends=('glibc')
diff --git a/extra/tamu-anova/PKGBUILD b/extra/tamu-anova/PKGBUILD
index 8b0df4485..64ed12558 100644
--- a/extra/tamu-anova/PKGBUILD
+++ b/extra/tamu-anova/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tamu-anova
 pkgver=0.2.1
 pkgrel=1
 pkgdesc="ANOVA Extensions to the GNU Scientific Library"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.stat.tamu.edu/~aredd/tamuanova/"
 license=('GPL')
 depends=('gsl')
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 73f1461fc..699f9ef42 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tcl
 pkgver=8.5.11
 pkgrel=1
 pkgdesc="The Tcl scripting language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index a2a2cf8b6..46373e5ee 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tcpdump
 pkgver=4.2.1
 pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tcpdump.org"
 license=('BSD')
 depends=('libpcap' 'openssl')
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index dca95ae49..f5f62c361 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tdb
 pkgver=1.2.9
 pkgrel=1
 pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL3')
 url="http://tdb.samba.org/"
 source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/telepathy-butterfly/PKGBUILD b/extra/telepathy-butterfly/PKGBUILD
index 915673e49..21cd94c91 100644
--- a/extra/telepathy-butterfly/PKGBUILD
+++ b/extra/telepathy-butterfly/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-butterfly
 pkgver=0.5.15
 pkgrel=1
 pkgdesc="A MSN connection manager for Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('GPL')
diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD
index a49577d12..b72920f75 100644
--- a/extra/telepathy-farsight/PKGBUILD
+++ b/extra/telepathy-farsight/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-farsight
 pkgver=0.0.19
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 license=('GPL')
 depends=('telepathy-glib' 'farsight2')
diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index a4354dac5..f4fc586b5 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-farstream
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="A telepathy-backend to use stream engine."
-arch=(i686 x86_64)
+arch=(mips64el)
 url="http://telepathy.freedesktop.org"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'farsight2')
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 19294d97f..a00bd59d8 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-gabble
 pkgver=0.14.1
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL2.1')
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 50899f7a9..08f37c7ef 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=telepathy-glib
 pkgver=0.16.4
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 license=('LGPL2.1')
 options=('!libtool' '!emptydirs')
diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD
index d2bce6be0..c406f75cc 100644
--- a/extra/telepathy-haze/PKGBUILD
+++ b/extra/telepathy-haze/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-haze
 pkgver=0.5.0
 pkgrel=1
 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 license=('GPL')
 depends=('telepathy-glib' 'libpurple')
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 417b88208..93f9dd16f 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=telepathy-idle
 pkgver=0.1.11
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An IRC connection manager for Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 0a0cb7a0c..04308db2b 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-kde-accounts-kcm
 pkgver=0.2.0
 pkgrel=2
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list'
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index a6ef75257..cc475f04b 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-kde-approver
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('kdelibs' 'telepathy-qt4' 'telepathy-kde-contact-list')
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index f8157097c..95b9166fd 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-kde-contact-list
 pkgver=0.2.0
 pkgrel=2
 pkgdesc="Telepathy contact list application"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-text-ui' 'telepathy-kde-send-file')
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 45beddc20..14082b80d 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-kde-filetransfer-handler
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('kdebase-runtime' 'telepathy-qt4')
diff --git a/extra/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD
index 88a0981b1..26fc89caa 100644
--- a/extra/telepathy-kde-presence-dataengine/PKGBUILD
+++ b/extra/telepathy-kde-presence-dataengine/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-kde-presence-dataengine
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Plasma dataengine for managing Telepathy account presence"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('kdebase-workspace' 'telepathy-qt4')
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 949597c5d..b45ae554c 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-kde-send-file
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list')
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 2e69f7a5f..0e5b61b5b 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-kde-text-ui
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Telepathy text chat handler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org"
 license=('GPL')
 depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-contact-list')
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index 5938b8311..16cbc416a 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=telepathy-logger
 pkgver=0.2.12
 pkgrel=1
 pkgdesc="Telepathy framework logging daemon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Logger"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf')
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index be3daa482..dfc000ed5 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=telepathy-mission-control
 pkgver=5.10.1
 pkgrel=1
 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Mission Control"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'libgnome-keyring')
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 1df655645..047c970fd 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-qt4
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index 4de770ea2..9cc79c69d 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-salut
 pkgver=0.6.0
 pkgrel=1
 pkgdesc="A link-local XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
diff --git a/extra/telepathy-sofiasip/PKGBUILD b/extra/telepathy-sofiasip/PKGBUILD
index 7704eac95..4205fee4a 100644
--- a/extra/telepathy-sofiasip/PKGBUILD
+++ b/extra/telepathy-sofiasip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-sofiasip
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="a SIP-protocol connection manager for the Telepathy framework based on SofiaSIP-stack."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 license=('LGPL')
 depends=('telepathy-glib' 'sofia-sip')
diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD
index 44383a3e1..eeefba762 100644
--- a/extra/terminal/PKGBUILD
+++ b/extra/terminal/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=terminal
 pkgver=0.4.8
 pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/projects/terminal/"
 groups=('xfce4')
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 2a2faef20..61165383a 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=testdisk
 pkgver=6.13
 pkgrel=1
 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
 license=('GPL')
 depends=('libjpeg>=8' 'openssl' 'progsreiserfs' 'ntfsprogs')
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 2f70efe32..cbd773d3f 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=texmacs
 pkgver=1.0.7.14
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.texmacs.org/"
 license=('GPL')
 depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2')
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index c72da64a7..93031c2d9 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tftp-hpa
 pkgver=5.2
 pkgrel=1
 pkgdesc="Official tftp server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/tftp/"
 license=('BSD')
 depends=('readline>=6.0.00')
@@ -33,3 +33,7 @@ md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
          '83fbb6f52205d95951a3c059e5351ca2'
          '414a79dc891bced056d99a9bb790fc9e'
          '6ce21e27b6fdc1a1adf85c81e42aeecf')
+md5sums=('281eab4f4f628c910369ec231e4cae24'
+         '83fbb6f52205d95951a3c059e5351ca2'
+         '414a79dc891bced056d99a9bb790fc9e'
+         '6ce21e27b6fdc1a1adf85c81e42aeecf')
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD
index 04d7b5b2d..2ef0460bf 100644
--- a/extra/thinkfinger/PKGBUILD
+++ b/extra/thinkfinger/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.3
 pkgrel=5
 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
 url="http://thinkfinger.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("GPL")
 depends=('pam' 'libusb-compat')
 install=thinkfinger.install
diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD
index 2f3a99803..eb27f8f03 100644
--- a/extra/thunar-archive-plugin/PKGBUILD
+++ b/extra/thunar-archive-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunar-archive-plugin
 pkgver=0.3.0
 pkgrel=1
 pkgdesc="create and deflate archives in thunar"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD
index 1c26c84b0..18be666e0 100644
--- a/extra/thunar-media-tags-plugin/PKGBUILD
+++ b/extra/thunar-media-tags-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunar-media-tags-plugin
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Adds special features for media files to the Thunar File Manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/thunar-volman/PKGBUILD b/extra/thunar-volman/PKGBUILD
index 8679d8273..b801223a0 100644
--- a/extra/thunar-volman/PKGBUILD
+++ b/extra/thunar-volman/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=thunar-volman
 pkgver=0.6.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="automatic management for removeable devices in thunar"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://foo-projects.org/~benny/projects/thunar-volman"
 groups=('xfce4-goodies')
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index ee13ccfa1..93b83d45a 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunar
 pkgver=1.2.3
 pkgrel=3
 pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://thunar.xfce.org"
 license=('GPL2' 'LGPL2.1')
 groups=('xfce4')
diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD
index aaca30008..62e5bedd6 100644
--- a/extra/tidyhtml/PKGBUILD
+++ b/extra/tidyhtml/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=tidyhtml
 pkgver=1.46
 pkgrel=2
 pkgdesc="A tool to tidy down your HTML code to a clean style"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tidy.sourceforge.net/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/tightvnc/PKGBUILD b/extra/tightvnc/PKGBUILD
index 642ba8d7f..78e0be4e6 100644
--- a/extra/tightvnc/PKGBUILD
+++ b/extra/tightvnc/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=tightvnc
 pkgver=1.3.10
 pkgrel=5
 pkgdesc="VNC Unix server && viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.tightvnc.com"
 depends=('libjpeg>=7' 'zlib' 'libxaw' 'libxp' 'xorg-xauth')
diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD
index 3bd8b4197..82706136f 100644
--- a/extra/time/PKGBUILD
+++ b/extra/time/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=time
 pkgver=1.7
 pkgrel=6
 pkgdesc="Utility for monitoring a program's use of system resources"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/directory/time.html"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD
index 82ced473c..7cdd2262c 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=timidity++
 pkgver=2.13.2
 pkgrel=10
 pkgdesc="A MIDI to WAVE converter and player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://timidity.sourceforge.net"
 license=('GPL')
 depends=('libao' 'libvorbis' 'jack' 'ncurses')
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index f1d6d4677..ef1c58f8e 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tk
 pkgver=8.5.11
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD
index 1602e2ca0..c04a71226 100644
--- a/extra/tomboy/PKGBUILD
+++ b/extra/tomboy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tomboy
 pkgver=1.8.3
 pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/tomboy/"
 depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 62e1d8555..9e7ac5f54 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tomcat-native
 pkgver=1.1.22
 pkgrel=1
 pkgdesc="The Apache Tomcat Native Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tomcat.apache.org/"
 license="Apache"
 depends=('apr' 'openssl')
diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
index 8875fed4f..a1bba1b67 100644
--- a/extra/tomcat/PKGBUILD
+++ b/extra/tomcat/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=tomcat
 pkgver=5.5.34
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Servlet-2.4/JSP-2.0 Container"
 url="http://tomcat.apache.org/"
 license=('APACHE')
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 18feb7958..90e76c40b 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 url="http://www.hadess.net/totem.php3"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('gmime' 'libsoup-gnome' 'libarchive')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 2ab70e259..0eccfcb05 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.2.1
 pkgrel=1
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'custom')
 depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
          'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
@@ -15,6 +15,10 @@ depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plpars
          'clutter-gtk' 'mx')
 makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils'
              'libepc' 'bluez' 'vala' 'grilo')
+[ "$CARCH" = "mips64el" ] && {
+makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner'
+             'libepc' 'bluez' 'vala' 'grilo')
+}
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
 sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4')
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index e5c25695b..cbeb63099 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.12.9
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 license=('GPL')
 makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
              'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 73566a33f..9faacb49b 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -8,7 +8,7 @@ _sripver=0.3-4
 pkgver=1.1.7
 pkgrel=1
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tcforge.berlios.de/"
 license=('GPL')
 depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD
index 6a223da76..5bbf5be0e 100644
--- a/extra/transfig/PKGBUILD
+++ b/extra/transfig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=transfig
 pkgver=3.2.5c
 pkgrel=3
 pkgdesc="Format conversion utility that can be used with xfig"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfig.org"
 license=('custom')
 depends=('libpng' 'libxpm')
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 2d43a286b..1d9353bd3 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.42
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
diff --git a/extra/trayer/PKGBUILD b/extra/trayer/PKGBUILD
index b125c6445..6f5de6602 100644
--- a/extra/trayer/PKGBUILD
+++ b/extra/trayer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=trayer
 pkgver=1.0
 pkgrel=6
 pkgdesc="A lightweight GTK2-based systray"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://gna.org/projects/fvwm-crystal/"
 license=('GPL' 'MIT')
 depends=('gtk2')
diff --git a/extra/tree/PKGBUILD b/extra/tree/PKGBUILD
index b718ec3ed..82294e718 100644
--- a/extra/tree/PKGBUILD
+++ b/extra/tree/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tree
 pkgver=1.6.0
 pkgrel=2
 pkgdesc="A directory listing program displaying a depth indented list of files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mama.indstate.edu/users/ice/tree/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index 4e831e6b3..ff3a03d79 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=7.1
 pkgrel=1
 pkgdesc="Free open-source cross-platform disk encryption software"
 url="http://www.truecrypt.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom') # TrueCrypt License v2.6
 depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
 makedepends=('nasm')
diff --git a/extra/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD
index 0c65f8794..f2ce9b83d 100644
--- a/extra/tsocks/PKGBUILD
+++ b/extra/tsocks/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tsocks
 pkgver=1.8beta5
 pkgrel=4
 pkgdesc='Transparent SOCKS proxying library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tsocks.sourceforge.net/'
 license=('GPL')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 69f4609af..e786a2553 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tumbler
 pkgver=0.1.23
 pkgrel=3
 pkgdesc="D-Bus service for applications to request thumbnails"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://git.xfce.org/xfce/tumbler/"
 license=('GPL2' 'LGPL')
 groups=('xfce4')
diff --git a/extra/tunepimp/PKGBUILD b/extra/tunepimp/PKGBUILD
index a3fe45ed5..caa9c1f0a 100644
--- a/extra/tunepimp/PKGBUILD
+++ b/extra/tunepimp/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.5.3
 pkgrel=8
 pkgdesc="A development library geared towards developers who wish to create MusicBrainz enabled tagging applications (aka libtunepimp)"
 url="http://www.musicbrainz.org/products/tunepimp/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 options=('!libtool' '!makeflags')
 makedepends=('python2')
diff --git a/extra/tuxpuck/PKGBUILD b/extra/tuxpuck/PKGBUILD
index bbd316b5d..65bd3c55a 100644
--- a/extra/tuxpuck/PKGBUILD
+++ b/extra/tuxpuck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tuxpuck
 pkgver=0.8.2
 pkgrel=4
 pkgdesc="Airhockey with tux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://home.no.net/munsuun/tuxpuck/"
 license=('GPL2')
 depends=('libjpeg>=8' 'sdl' 'libpng>=1.4.0' 'libvorbis')
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 956000619..f42dd8ab0 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=twisted
 pkgver=11.1.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://twistedmatrix.com/"
 license=('MIT')
 depends=('python2' 'pycrypto' 'zope-interface')
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 68017ee1a..b891e8a9f 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
 depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 01142b16b..5d26828ed 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uim
 pkgver=1.7.2
 pkgrel=1
 pkgdesc='Multilingual input method library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/uim/'
 license=('custom:BSD')
 depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD
index b37f17f42..d2e8aa764 100644
--- a/extra/umfpack/PKGBUILD
+++ b/extra/umfpack/PKGBUILD
@@ -10,9 +10,9 @@ _amdver=2.2.1
 _cholmodver=1.7.1
 _colamdver=2.7.2
 _ccolamdver=2.7.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cise.ufl.edu/research/sparse/umfpack"
 license=('LGPL')
 makedepends=('lapack' 'blas')
@@ -26,9 +26,9 @@ source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz
 	http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz
 	http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz
 	UFconfig.mk)
-md5sums=('b3490d4f529fbcf4f415e60aa2680a15'
-         '4335ee565feec67e8ba9fc0f6a5e2504'
-         '25548053958c1c5810b17d077b8f37b9'
+md5sums=('19f5d8b4231ec9114718641ce51cce6e'
+         '526413bbbc94f987cf79619d9110bab4'
+         'b3e9679ba20635ac4847f01c01d6e992'
          '9032c5724bee43ccd8f4546338a29fac'
          '2b4e43c8ef33dacfade6d1ec49542ac1'
          '79d813d5b54951060fc264172bfb5ca6'
@@ -38,7 +38,7 @@ build() {
   cd "$srcdir/UMFPACK"
   cp -rf "$srcdir/UFconfig/xerbla" .
   cp -L ../UFconfig.mk $startdir/src/UFconfig
-  [ $CARCH == "x86_64" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk
+  [ $CARCH != "i686" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk
   make library || return 1
   install -d "$pkgdir/usr/lib" "$pkgdir/usr/include"
 
diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD
index 059ab98a2..ffa6ab40b 100644
--- a/extra/unison/PKGBUILD
+++ b/extra/unison/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unison
 pkgver=2.40.63
 pkgrel=2
 pkgdesc="Unison is a file-synchronization tool"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.cis.upenn.edu/~bcpierce/unison"
 depends=('glibc')
diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD
index 36a06ccae..7437a1d03 100644
--- a/extra/unixodbc/PKGBUILD
+++ b/extra/unixodbc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=unixodbc
 pkgver=2.3.1
 pkgrel=1
 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://www.unixodbc.org/"
 backup=('etc/odbc.ini' 'etc/odbcinst.ini')
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index a82a303bb..7092eceee 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=upower
 pkgver=0.9.15
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://upower.freedesktop.org"
 license=('GPL')
 depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD
index 1fe072642..2f893a942 100644
--- a/extra/usbmuxd/PKGBUILD
+++ b/extra/usbmuxd/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=usbmuxd
 pkgver=1.0.7
-pkgrel=2
+pkgrel=2.1
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'GPL3' 'LGPL2.1')
 depends=('libusb>=1.0.8')
 makedepends=('cmake')
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index 093b7007d..f8f794675 100644
--- a/extra/usbview/PKGBUILD
+++ b/extra/usbview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=usbview
 pkgver=1.1
 pkgrel=3
 pkgdesc="USB Viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kroah.com/linux-usb/"
 license=('GPL')
 depends=('gtk2')
diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD
index 88575e8c4..b294040a7 100644
--- a/extra/usermin/PKGBUILD
+++ b/extra/usermin/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=usermin
 pkgver=1.490
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom:usermin')
 url="http://www.webmin.com/"
 depends=('perl' 'webmin')
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 3fb5d3b86..2d39e01f9 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
 pkgver=0.8.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/libv4l"
 provides=("libv4l=$pkgver")
 replaces=('libv4l')
diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD
index 5e3bb7af1..d142a2f8b 100644
--- a/extra/v86d/PKGBUILD
+++ b/extra/v86d/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=v86d
 pkgver=0.1.10
 pkgrel=2
 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 url="http://dev.gentoo.org/~spock/projects/uvesafb/"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index a8bc6ad19..ee3ae699c 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vala
 pkgver=0.14.1
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Vala"
 license=('LGPL')
 depends=('glib2')
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
deleted file mode 100644
index c5e0b99ab..000000000
--- a/extra/valgrind/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 145921 2012-01-04 01:26:06Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=valgrind
-pkgver=3.7.0
-pkgrel=2
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/"
-depends=('glibc>=2.15' 'glibc<2.16' 'perl')
-makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.15.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
-         'f534b79b358cdced0319b375aafde4d5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man
-  fi
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index 72a3938d5..599b1c642 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vamp-plugin-sdk
 pkgver=2.2
 pkgrel=1
 pkgdesc="The Vamp audio analysis plug-in system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vamp-plugins.org/"
 license=('BSD')
 depends=('gcc-libs' 'libsndfile')
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 506e911be..a9292949c 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=varnish
 pkgver=3.0.2
 pkgrel=4
 pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
+arch=(mips64el)
 url="http://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index f3d94d176..d2c3f139c 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=vcdimager
 pkgver=0.7.24
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vcdimager.org/"
 license=('GPL')
 depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt')
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index ab58cdaad..7697cd05e 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('bash' 'libpcap' 'openssl')
 backup=(etc/conf.d/vde)
 source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
diff --git a/extra/vdpau-video/PKGBUILD b/extra/vdpau-video/PKGBUILD
index b426e758e..44fcf8506 100644
--- a/extra/vdpau-video/PKGBUILD
+++ b/extra/vdpau-video/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=vdpau-video
 pkgver=0.7.3
 pkgrel=2
 pkgdesc="VDPAU backend for VA API"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/"
 license=('GPL')
 depends=('libva' 'libvdpau')
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 316933b34..e7ff01c5e 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vice
 pkgver=2.3
 pkgrel=4
 pkgdesc="A Versatile Commodore Emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.viceteam.org/"
 depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 6bc34f5fe..e4134fdeb 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -6,13 +6,13 @@ pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.8.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
 makedepends=(# runtime deps
              'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
 	     # additional makedeps
-             'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
+             'cmake' 'python2-nose' 'doxygen' 'python-sphinx' 'boost' 'python2-numpy')
 options=('!libtool')
 source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 	vigra-1.7.1.gcc460.patch)
@@ -27,6 +27,7 @@ build() {
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DPYTHON_EXECUTABLE=/usr/bin/python2 \
       -DWITH_VIGRANUMPY=1 \
+      -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
       -DDOCINSTALL=share/doc 
   make
 }
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 24ca456e6..63584d79b 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -11,7 +11,7 @@ __hgrev=0dabc2ce136c
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
 makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
@@ -70,7 +70,7 @@ build() {
   cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=ArchLinux \
+    --with-features=big --with-compiledby=Parabola \
     --enable-gpm --enable-acl --with-x=no \
     --disable-gui --enable-multibyte --enable-cscope \
     --disable-netbeans --enable-perlinterp --disable-pythoninterp \
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index c25b490eb..5f141bb08 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vinagre
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/vinagre/"
 install=vinagre.install
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index a7da32570..2cbfc7219 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vino
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
 makedepends=('intltool' 'networkmanager')
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 6d79cde5f..053c92e47 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=virtuoso
 pkgver=6.1.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 257798d85..9551054de 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vlc
 pkgver=1.1.13
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
 depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
@@ -31,6 +31,20 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libpulse: PulseAudio support'
             'vdpau-video: vdpau back-end for nvidia'
             'libva-driver-intel: back-end for intel cards')
+[ "$CARCH" = "mips64el" ] && {
+makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
+             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
+             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
+             'gnutls' 'libcaca')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libpulse: PulseAudio support')
+}
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/http/.hosts'
@@ -47,6 +61,21 @@ build() {
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
+  if [ "$CARCH" = "mips64el" ]; then
+  ./configure --prefix=/usr \
+              --disable-rpath \
+              --enable-faad \
+              --enable-v4l \
+              --enable-snapshot \
+              --enable-dbus-control \
+              --enable-nls \
+              --disable-lirc \
+              --enable-pvr \
+              --enable-ncurses \
+              --with-live555-tree=/usr/lib/live \
+              --enable-upnp \
+              --enable-realrtsp
+  else
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
@@ -60,6 +89,7 @@ build() {
               --with-live555-tree=/usr/lib/live \
               --enable-upnp \
               --enable-realrtsp
+  fi
   make
 }
 package() {
diff --git a/extra/vorbis-tools/PKGBUILD b/extra/vorbis-tools/PKGBUILD
index 706d8a8fb..8fd3c7949 100644
--- a/extra/vorbis-tools/PKGBUILD
+++ b/extra/vorbis-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vorbis-tools
 pkgver=1.4.0
 pkgrel=2
 pkgdesc="Extra tools for Ogg-Vorbis"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.xiph.org/vorbis/'
 license=('GPL2')
 depends=('libao' 'libvorbis' 'curl' 'flac')
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index ae8a08765..ad1e703de 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -11,7 +11,7 @@ url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 license=('GPL')
 depends=('libgcrypt' 'openssl' 'iproute2')
 optdepends=('openresolv: Let vpnc manage resolv.conf')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"
         'vpnc.conf')
 backup=('etc/vpnc/default.conf')
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
index 465974f25..77604f684 100644
--- a/extra/vsftpd/PKGBUILD
+++ b/extra/vsftpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vsftpd
 pkgver=2.3.5
 pkgrel=1
 pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://security.appspot.com/vsftpd.html"
 license=('GPL2')
 depends=('openssl')
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index d35c20c63..14cb5013b 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vte
 pkgver=0.28.2
 pkgrel=3
 pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 depends=('gtk2' 'vte-common')
diff --git a/extra/w3m/GC_set_warn_proc.patch b/extra/w3m/GC_set_warn_proc.patch
new file mode 100644
index 000000000..a679c8d23
--- /dev/null
+++ b/extra/w3m/GC_set_warn_proc.patch
@@ -0,0 +1,12 @@
+--- main.c.orig	2011-09-07 17:30:01.181808262 +0200
++++ main.c	2011-09-07 17:30:52.833808484 +0200
+@@ -833,7 +833,8 @@
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
+-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++    orig_GC_warn_proc = GC_get_warn_proc();
++    GC_set_warn_proc(wrap_GC_warn_proc);
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */
diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD
index 80e79e08b..07360a028 100644
--- a/extra/w3m/PKGBUILD
+++ b/extra/w3m/PKGBUILD
@@ -5,17 +5,20 @@ pkgname=w3m
 pkgver=0.5.3
 pkgrel=1
 pkgdesc='Text-based Web browser, as well as pager'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://w3m.sourceforge.net/'
 license=('custom')
 depends=('openssl' 'gc' 'ncurses' 'zlib')
 makedepends=('imlib2')
 optdepends=('imlib2: for graphics support') 
-source=("http://downloads.sourceforge.net/sourceforge/w3m/$pkgname-$pkgver.tar.gz")
-sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237')
+source=("http://downloads.sourceforge.net/sourceforge/w3m/$pkgname-$pkgver.tar.gz"
+        "GC_set_warn_proc.patch")
+sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237'
+          '8bf1eae3241f5781d121319c8ee9bcda32d1f7bd')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+        patch -Np0 -i "${srcdir}/GC_set_warn_proc.patch"
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
@@ -34,4 +37,4 @@ package() {
 	install -d "$pkgdir"/usr/share/{doc,licenses}/"$pkgname"
 	find doc/* | grep -v CVS | xargs -i install "{}" "$pkgdir/usr/share/doc/$pkgname/"
 	ln -s "../../doc/$pkgname/README" "$pkgdir/usr/share/licenses/$pkgname/"
-}
\ No newline at end of file
+}
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index cb4c36d88..95801df8c 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=watchdog
 pkgver=5.9
 pkgrel=2
 pkgdesc="Watchdog daemon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/watchdog"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD
index c27e4dccb..db618dd58 100644
--- a/extra/wavpack/PKGBUILD
+++ b/extra/wavpack/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=wavpack
 pkgver=4.60.1
 pkgrel=2
 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.wavpack.com/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD
index 9d3179e53..03213af1d 100644
--- a/extra/webkit-sharp/PKGBUILD
+++ b/extra/webkit-sharp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=webkit-sharp
 pkgver=0.3
 pkgrel=3
 pkgdesc="Mono/.NET bindings for the WebKit rendering engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mono-project.com/"
 license=('custom:MIT')
 depends=('gtk-sharp-2' 'libwebkit>=1.4.0')
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index f1112e39d..daf3477a9 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=webmin
 pkgver=1.570
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom:webmin')
 url="http://www.webmin.com/"
 depends=('perl')
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index a8c893f44..144e12ccc 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=weechat
 pkgver=0.3.6
 pkgrel=2
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
 license=('GPL')
 depends=('gnutls')
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index 6631575b6..ed809500d 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=wesnoth
 pkgver=1.8.6
 pkgrel=3
 pkgdesc="A turn-based strategy game on a fantasy world"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 895703035..3453d7943 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=whois
 pkgver=5.0.14
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linux.it/~md/software/"
 license=('GPL')
 depends=('libidn')
diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD
index 4037626f8..3badf429f 100644
--- a/extra/windowmaker-crm-git/PKGBUILD
+++ b/extra/windowmaker-crm-git/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=windowmaker-crm-git
 pkgver=20120109
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.windowmaker.org"
 license=('GPL' 'custom')
 depends=('libxinerama' 'libxrandr' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu')
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index ecda30c8f..dadeca510 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=windowmaker
 pkgver=0.95.0
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.windowmaker.org/"
 license=('GPL' 'custom')
 depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
diff --git a/extra/wipe/PKGBUILD b/extra/wipe/PKGBUILD
index b876b0dca..d7e4b1107 100644
--- a/extra/wipe/PKGBUILD
+++ b/extra/wipe/PKGBUILD
@@ -10,14 +10,15 @@ pkgrel=2
 pkgdesc='Secure file wiping utility'
 url='http://wipe.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('72aa8bcbeb54deb676ae08af78401132860703de')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --mandir=/usr/share/man
-	make
+  cd $srcdir/$pkgname-$pkgver
+  [ "$CARCH" = "mips64el" ] && extra="--build=$CHOST --host=$CHOST --target=$CHOST"
+  ./configure --prefix=/usr --mandir=/usr/share/man $extra
+  make
 }
 
 package() {
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 1ebf77ac2..b49bdd3b6 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
 pkgver=1.6.5
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index 96095398d..2b38788de 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.7.3
 pkgrel=1
 pkgdesc="A Qt frontend to wpa_supplicant"
 url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qt' "wpa_supplicant=$pkgver")
 license=('GPL')
 source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD
index 0e8208ae6..3b626f0d7 100644
--- a/extra/wv/PKGBUILD
+++ b/extra/wv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wv
 pkgver=1.2.7
 pkgrel=1
 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/wvware"
 license=(GPL)
 depends=('libgsf>=1.14.18' 'libpng>=1.4.2' 'sh')
diff --git a/extra/wv2/PKGBUILD b/extra/wv2/PKGBUILD
index a30b0f9c4..73b733286 100644
--- a/extra/wv2/PKGBUILD
+++ b/extra/wv2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wv2
 pkgver=0.4.2
 pkgrel=2
 pkgdesc="MSWord 9,8,7,6 formats parser"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/wvware/"
 depends=('libgsf')
 makedepends=('cmake')
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 8ecf8e479..bc628e185 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wxgtk
 pkgver=2.8.12.1
 pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index d106536da..844367692 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wxmaxima
 pkgver=11.08.0
 pkgrel=2
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wxmaxima.sourceforge.net/"
 license=('GPL2')
 depends=('maxima' 'libxml2' 'wxgtk')
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 6ce4fcba5..552a2bf27 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wxpython
 pkgver=2.8.12.1
 pkgrel=3
 pkgdesc="A wxWidgets GUI toolkit for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:wxWindows')
 url="http://www.wxpython.org"
 depends=('wxgtk' 'python2')
diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD
index fd49db451..c1324d590 100644
--- a/extra/x11vnc/PKGBUILD
+++ b/extra/x11vnc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=x11vnc
 pkgver=0.9.13
 pkgrel=1
 pkgdesc='VNC server for real X displays'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.karlrunge.com/x11vnc/'
 license=('GPL2')
 depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index dc8f17316..78a9bf82e 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=x264
 pkgver=20111030
 pkgrel=1
 pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/developers/x264.html"
 license=('GPL')
 depends=('glibc')
@@ -18,7 +18,9 @@ md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
 build() {
     cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
 
-    ./configure --enable-shared
+    [ "$CARCH" = "mips64el" ] && extra="--enable-pic"
+
+    ./configure --enable-shared $extra
 
     make
     make DESTDIR="$pkgdir" \
diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD
index 8389e2ef8..3fa89f714 100644
--- a/extra/x2x/PKGBUILD
+++ b/extra/x2x/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=x2x
 pkgver=1.27
 pkgrel=6
 pkgdesc="Control one X display from another"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="https://github.com/dottedmag/x2x"
 license=('custom')
 depends=('libxtst')
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD
index 3d3a5b31b..28a1f9c9f 100644
--- a/extra/xaos/PKGBUILD
+++ b/extra/xaos/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xaos
 pkgver=3.5
 pkgrel=4
 pkgdesc="A fast portable real-time interactive fractal zoomer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/xaos/"
 license=('GPL')
 depends=('gsl' 'libpng' 'aalib')
diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 8854d9e98..931513921 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xaw3d
 pkgver=1.5E
 pkgrel=3
 pkgdesc="Three-D Athena widgets"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://directory.fsf.org/project/xaw3d/"
 license=('MIT')
 depends=('libxmu' 'libxpm')
diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD
index e9876a82e..4bd5f8da5 100644
--- a/extra/xawtv/PKGBUILD
+++ b/extra/xawtv/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xawtv
 pkgver=3.101
 pkgrel=1
 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/extra/xbill/PKGBUILD b/extra/xbill/PKGBUILD
index 98054c7eb..7b9503c78 100644
--- a/extra/xbill/PKGBUILD
+++ b/extra/xbill/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xbill
 pkgver=2.1
 pkgrel=7
 pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xbill.org/"
 license=('GPL')
 depends=('xaw3d')
diff --git a/extra/xcb-util-image/PKGBUILD b/extra/xcb-util-image/PKGBUILD
index 18fd700ba..516ded1a7 100644
--- a/extra/xcb-util-image/PKGBUILD
+++ b/extra/xcb-util-image/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-image
 pkgver=0.3.8
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7' 'xcb-util>=0.3.8')
diff --git a/extra/xcb-util-keysyms/PKGBUILD b/extra/xcb-util-keysyms/PKGBUILD
index 618d0687c..efc92fb6b 100644
--- a/extra/xcb-util-keysyms/PKGBUILD
+++ b/extra/xcb-util-keysyms/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-keysyms
 pkgver=0.3.8
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
diff --git a/extra/xcb-util-renderutil/PKGBUILD b/extra/xcb-util-renderutil/PKGBUILD
index be4789175..4acc983b3 100644
--- a/extra/xcb-util-renderutil/PKGBUILD
+++ b/extra/xcb-util-renderutil/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-renderutil
 pkgver=0.3.8
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - Convenience functions for the Render extension"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD
index 5b17b5bd8..43b712a49 100644
--- a/extra/xcb-util-wm/PKGBUILD
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-wm
 pkgver=0.3.8
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
diff --git a/extra/xcb-util/PKGBUILD b/extra/xcb-util/PKGBUILD
index 588e29f70..ac43b76d3 100644
--- a/extra/xcb-util/PKGBUILD
+++ b/extra/xcb-util/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xcb-util
 pkgver=0.3.8
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 938ef597b..569da6710 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xchm
 pkgver=1.20
 pkgrel=2
 pkgdesc="A cross-platform GUI front-end to chmlib"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xchm.sourceforge.net/"
 license=('GPL')
 depends=('chmlib' 'wxgtk' 'desktop-file-utils')
@@ -21,7 +21,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+              --build=$CHOST \
+              --host=$CHOST
   make
 }
 
diff --git a/extra/xclip/PKGBUILD b/extra/xclip/PKGBUILD
index 57834cdc0..d14e1bb42 100644
--- a/extra/xclip/PKGBUILD
+++ b/extra/xclip/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xclip
 pkgver=0.12
 pkgrel=2
 pkgdesc='Command line interface to the X11 clipboard'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/xclip'
 license=('GPL')
 depends=('libxmu')
diff --git a/extra/xcompmgr/PKGBUILD b/extra/xcompmgr/PKGBUILD
index 817b015b1..4769d7443 100644
--- a/extra/xcompmgr/PKGBUILD
+++ b/extra/xcompmgr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xcompmgr
 pkgver=1.1.5
 pkgrel=1
 pkgdesc="Composite Window-effects manager for X.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcomposite' 'libxdamage' 'libxrender')
diff --git a/extra/xdelta/PKGBUILD b/extra/xdelta/PKGBUILD
index 1cc6f85b1..1791df648 100644
--- a/extra/xdelta/PKGBUILD
+++ b/extra/xdelta/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xdelta
 pkgver=1.1.4
 pkgrel=4
 pkgdesc="binary file delta generator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/xdelta/"
 license=('GPL')
 depends=('glib' 'zlib')
diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD
index 05cabed7d..65dbad1d2 100644
--- a/extra/xdelta3/PKGBUILD
+++ b/extra/xdelta3/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xdelta3
 pkgver=3.0.0
 pkgrel=2
 pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xdelta.org/"
 license=('GPL')
 makedepends=('python2')
diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 49eb109fe..c07e69d4a 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-acecad
 pkgver=1.5.0
 pkgrel=2
 pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('sysfsutils')
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index dd0075860..e4f7ab6ba 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-aiptek
 pkgver=1.4.1
 pkgrel=2
 pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index 47296c598..b56a620c4 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-input-evdev
 pkgver=2.6.0
 pkgrel=4
 pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index 7badf2933..7c8fa0ab0 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-joystick
 pkgver=1.6.0
 pkgrel=3
 pkgdesc="X.Org Joystick input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index 18915c806..009bc808f 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-keyboard
 pkgver=1.6.0
 pkgrel=3
 pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 56f28ff52..ffff8fec6 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-mouse
 pkgver=1.7.1
 pkgrel=2
 pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index 327a31176..a0b628d28 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xf86-input-synaptics
 pkgver=1.5.0
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst')
diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index 312657dc5..411a25c62 100644
--- a/extra/xf86-input-void/PKGBUILD
+++ b/extra/xf86-input-void/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-void
 pkgver=1.4.0
 pkgrel=2
 pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 559e63924..bee71c7e7 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xf86-input-wacom
 pkgver=0.13.0
 pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwacom.sourceforge.net/"
 license=('GPL')
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD
index c15e421d8..dee8429de 100644
--- a/extra/xf86-video-apm/PKGBUILD
+++ b/extra/xf86-video-apm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-apm
 pkgver=1.2.3
 pkgrel=4
 pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD
index 9f07d6a0c..dc5ab26e8 100644
--- a/extra/xf86-video-ark/PKGBUILD
+++ b/extra/xf86-video-ark/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-ark
 pkgver=0.7.3
 pkgrel=4
 pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD
index a51fd704b..f3effc947 100644
--- a/extra/xf86-video-ast/PKGBUILD
+++ b/extra/xf86-video-ast/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-ast
 pkgver=0.93.9
 pkgrel=1
 pkgdesc="X.org ASPEED AST Graphics video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 2aff325a5..d0783dedf 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-video-ati
 pkgver=6.14.3
 pkgrel=1
 pkgdesc="X.org ati video driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(libpciaccess libdrm udev pixman ati-dri)
diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD
index f558899d2..b0a05fdfe 100644
--- a/extra/xf86-video-chips/PKGBUILD
+++ b/extra/xf86-video-chips/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-video-chips
 pkgver=1.2.4
 pkgrel=3
 pkgdesc="X.org Chips and Technologies video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD
index a2b46e91e..3a9024d8d 100644
--- a/extra/xf86-video-cirrus/PKGBUILD
+++ b/extra/xf86-video-cirrus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-cirrus
 pkgver=1.3.2
 pkgrel=7
 pkgdesc="X.org Cirrus Logic video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index 9e065565c..7dbc457fe 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-dummy
 pkgver=0.3.4
 pkgrel=5
 pkgdesc="X.org dummy video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index ebef4fe1c..fd626bdb8 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.2
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org framebuffer video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD
index 0566ff9b6..0b606721e 100644
--- a/extra/xf86-video-glint/PKGBUILD
+++ b/extra/xf86-video-glint/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-glint
 pkgver=1.2.6
 pkgrel=1
 pkgdesc="X.org GLINT/Permedia video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD
index 7c63f8002..3b0db9e15 100644
--- a/extra/xf86-video-i128/PKGBUILD
+++ b/extra/xf86-video-i128/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-i128
 pkgver=1.3.4
 pkgrel=4
 pkgdesc="X.org Number 9 I128 video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD
index 615e7106c..1d7e2446e 100644
--- a/extra/xf86-video-i740/PKGBUILD
+++ b/extra/xf86-video-i740/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-i740
 pkgver=1.3.2
 pkgrel=7
 pkgdesc="X.org Intel i740 video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 2d96a4ec0..003d6ddf6 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-intel
 pkgver=2.17.0
 pkgrel=2
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev')
diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index 2cbfb8b9f..efe509fbf 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-mach64
 pkgver=6.9.0
 pkgrel=2
 pkgdesc="X.org mach64 video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'mach64-dri')
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index 8b4289add..1ee157c59 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-mga
 pkgver=1.4.13
 pkgrel=4
 pkgdesc="X.org mga video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'mga-dri')
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index b996da01c..2a1bac87d 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-neomagic
 pkgver=1.2.5
 pkgrel=5
 pkgdesc="X.org neomagic video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index f08fb5823..265ba60ca 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -7,7 +7,7 @@ _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')
+arch=('i686' 'x86_64' 'mips64el')
 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')
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index 7dab5a944..329f39acb 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-nv
 pkgver=2.1.18
 pkgrel=4
 pkgdesc="X.org nv video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index cb982ec8b..7e4f5bee5 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.2.904
 _svnver=r933
 pkgrel=6
 pkgdesc="X.Org Openchrome drivers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://www.openchrome.org"
 depends=('libdrm' 'libxvmc' 'unichrome-dri')
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 86b9f89e1..d40f8b417 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-r128
 pkgver=6.8.1
 pkgrel=7
 pkgdesc="X.org ati Rage128 video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'r128-dri')
diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD
index 32ee7deba..41bb56a7e 100644
--- a/extra/xf86-video-rendition/PKGBUILD
+++ b/extra/xf86-video-rendition/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-rendition
 pkgver=4.2.4
 pkgrel=5
 pkgdesc="X.org Rendition video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD
index 54b255a01..44b059ea1 100644
--- a/extra/xf86-video-s3/PKGBUILD
+++ b/extra/xf86-video-s3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-s3
 pkgver=0.6.3
 pkgrel=6
 pkgdesc="X.org S3 video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD
index 650769602..170bd31aa 100644
--- a/extra/xf86-video-s3virge/PKGBUILD
+++ b/extra/xf86-video-s3virge/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-video-s3virge
 pkgver=1.10.4
 pkgrel=6
 pkgdesc="X.org S3 Virge video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index f305995f7..84aabffc1 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-savage
 pkgver=2.3.3
 pkgrel=1
 pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'savage-dri')
diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD
index d77e30c1e..e2e588c5c 100644
--- a/extra/xf86-video-siliconmotion/PKGBUILD
+++ b/extra/xf86-video-siliconmotion/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.5
-pkgrel=3
+pkgrel=5
 pkgdesc="X.org siliconmotion video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
@@ -14,11 +14,14 @@ makedepends=('xorg-server-devel>=1.10.99.902')
 conflicts=('xorg-server<1.10.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('946acae0822d51da57abe8b7ed049691bd731589')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff)
+sha1sums=('946acae0822d51da57abe8b7ed049691bd731589'
+          '84c98a3341d92ed678ad0dee2033d571bd6b29ca')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  [ "$CARCH" = "mips64el" ] && patch -Np1 -i ${srcdir}/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff
   ./configure --prefix=/usr
   make
   make DESTDIR="${pkgdir}" install
@@ -26,3 +29,5 @@ build() {
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+sha1sums=('946acae0822d51da57abe8b7ed049691bd731589'
+          'b3cc8e8aaaabdf25857b781d6793c70815003f9b')
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index 8f247c1d4..2868e778d 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-sis
 pkgver=0.10.3
 pkgrel=5
 pkgdesc="X.org SiS video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'sis-dri')
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD
index aad955f07..2f60b97b4 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-sisusb
 pkgver=0.9.4
 pkgrel=5
 pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD
index 1d8a6948b..b14b9c702 100644
--- a/extra/xf86-video-tdfx/PKGBUILD
+++ b/extra/xf86-video-tdfx/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-tdfx
 pkgver=1.4.3
 pkgrel=7
 pkgdesc="X.org tdfx video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'tdfx-dri')
diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD
index f7d60ed27..94b915cbe 100644
--- a/extra/xf86-video-trident/PKGBUILD
+++ b/extra/xf86-video-trident/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-trident
 pkgver=1.3.4
 pkgrel=5
 pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD
index ce88b5e0b..7701c55a3 100644
--- a/extra/xf86-video-tseng/PKGBUILD
+++ b/extra/xf86-video-tseng/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-tseng
 pkgver=1.2.4
 pkgrel=5
 pkgdesc="X.org tseng video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-unichrome/PKGBUILD b/extra/xf86-video-unichrome/PKGBUILD
index ca012bc28..f5812b9fa 100644
--- a/extra/xf86-video-unichrome/PKGBUILD
+++ b/extra/xf86-video-unichrome/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.2.7
 pkgrel=6
 _gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
 pkgdesc="Unichrome video drivers for X.Org"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://unichrome.sf.net/"
 license=('custom')
 depends=('glibc' 'unichrome-dri')
diff --git a/extra/xf86-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD
index bc3f36b95..24c61207a 100644
--- a/extra/xf86-video-v4l/PKGBUILD
+++ b/extra/xf86-video-v4l/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-v4l
 pkgver=0.2.0
 pkgrel=9
 pkgdesc="X.org v4l video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD
index 91d85103c..c4f795970 100644
--- a/extra/xf86-video-vesa/PKGBUILD
+++ b/extra/xf86-video-vesa/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-vesa
 pkgver=2.3.0
 pkgrel=7
 pkgdesc="X.org vesa video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD
index 2ee2775ef..dc958e86b 100644
--- a/extra/xf86-video-voodoo/PKGBUILD
+++ b/extra/xf86-video-voodoo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-voodoo
 pkgver=1.2.4
 pkgrel=5
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-xgi/PKGBUILD b/extra/xf86-video-xgi/PKGBUILD
index 48f22a0b0..eba790b99 100644
--- a/extra/xf86-video-xgi/PKGBUILD
+++ b/extra/xf86-video-xgi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-xgi
 pkgver=1.6.0
 pkgrel=4
 pkgdesc="X.org XGI video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xf86-video-xgixp/PKGBUILD b/extra/xf86-video-xgixp/PKGBUILD
index c3dd3e706..884a53446 100644
--- a/extra/xf86-video-xgixp/PKGBUILD
+++ b/extra/xf86-video-xgixp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-xgixp
 pkgver=1.8.0
 pkgrel=4
 pkgdesc="X.org XGIXP video driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD
index 7ff0c7cf1..3566c2582 100755
--- a/extra/xfburn/PKGBUILD
+++ b/extra/xfburn/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=xfburn
 pkgver=0.4.3
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="a simple CD/DVD burning tool based on libburnia libraries"
 url="http://goodies.xfce.org/projects/applications/xfburn"
 license=('GPL2')
diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD
index 063795561..0b9203407 100644
--- a/extra/xfce-utils/PKGBUILD
+++ b/extra/xfce-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce-utils
 pkgver=4.8.3
 pkgrel=1
 pkgdesc="Utilities for Xfce"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
@@ -31,7 +31,7 @@ build() {
 	--disable-static \
 	--enable-dbus \
 	--disable-debug \
-	--with-vendor-info=ArchLinux # 	--enable-gen-doc \
+	--with-vendor-info=Parabola # 	--enable-gen-doc \
   make
 }
 
diff --git a/extra/xfce4-appfinder/PKGBUILD b/extra/xfce4-appfinder/PKGBUILD
index 9eac46486..7d61e5cb6 100644
--- a/extra/xfce4-appfinder/PKGBUILD
+++ b/extra/xfce4-appfinder/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-appfinder
 pkgver=4.8.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Xfce application finder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index 62e2ae5bd..3c989fdf2 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-battery-plugin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A battery monitor plugin for the Xfce panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index 25403c890..0c85faa38 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-clipman-plugin
 pkgver=1.2.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A clipboard plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-cpufreq-plugin/PKGBUILD b/extra/xfce4-cpufreq-plugin/PKGBUILD
index bea6bf602..980cd727d 100644
--- a/extra/xfce4-cpufreq-plugin/PKGBUILD
+++ b/extra/xfce4-cpufreq-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-cpufreq-plugin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="CPU frequency plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-cpugraph-plugin/PKGBUILD b/extra/xfce4-cpugraph-plugin/PKGBUILD
index f775fcce7..c546f0bd7 100644
--- a/extra/xfce4-cpugraph-plugin/PKGBUILD
+++ b/extra/xfce4-cpugraph-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-cpugraph-plugin
 pkgver=1.0.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="CPU graph plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD
index 3d9e2a532..e8d559062 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-datetime-plugin
 pkgver=0.6.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A date and time display plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD
index 0b56b17ac..7b47fcb20 100644
--- a/extra/xfce4-dev-tools/PKGBUILD
+++ b/extra/xfce4-dev-tools/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-dev-tools
 pkgver=4.9.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Xfce developer tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 depends=('gtk-doc' 'automake' 'automake' 'make' 'intltool' 'pkg-config')
diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD
index 344d7f37d..933c812f3 100644
--- a/extra/xfce4-dict/PKGBUILD
+++ b/extra/xfce4-dict/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-dict
 pkgver=0.6.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A dictionary plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-dict"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 11af81a49..2cff43272 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-diskperf-plugin
 pkgver=2.3.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD
index 454c329c4..4ef421a92 100644
--- a/extra/xfce4-eyes-plugin/PKGBUILD
+++ b/extra/xfce4-eyes-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-eyes-plugin
 pkgver=4.4.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-fsguard-plugin/PKGBUILD b/extra/xfce4-fsguard-plugin/PKGBUILD
index 11202e348..841aabb83 100644
--- a/extra/xfce4-fsguard-plugin/PKGBUILD
+++ b/extra/xfce4-fsguard-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-fsguard-plugin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="File system usage monitor plugin for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 074f82688..724d79bb1 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -6,12 +6,12 @@ pkgname=xfce4-genmon-plugin
 pkgver=3.3.1
 pkgrel=1
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL2.1')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool')
+makedepends=('gettext' 'intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD
index ebc9be73a..71b7041c9 100644
--- a/extra/xfce4-mailwatch-plugin/PKGBUILD
+++ b/extra/xfce4-mailwatch-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-mailwatch-plugin
 pkgver=1.1.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD
index dd0e3337f..22ec53e7c 100644
--- a/extra/xfce4-mixer/PKGBUILD
+++ b/extra/xfce4-mixer/PKGBUILD
@@ -3,17 +3,17 @@
 
 pkgname=xfce4-mixer
 pkgver=4.8.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The volume control plugin for the Xfce panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
 depends=("xfce4-panel>=4.8.0" 'gstreamer0.10-base>=0.10.22' 'hicolor-icon-theme')
 makedepends=('intltool')
-optdepends=('gstreamer0.10-base-plugins:  to support basic audio hardware' \
-            'gstreamer0.10-good-plugins:  well supported hardware'\
-            'gstreamer0.10-bad-plugins:   not so well supported hardware'\
+optdepends=('gstreamer0.10-base-plugins:  to support basic audio hardware' 
+            'gstreamer0.10-good-plugins:  well supported hardware'
+            'gstreamer0.10-bad-plugins:   not so well supported hardware'
             'gstreamer0.10-ugly-plugins:  might contain questionable license hardware')
 options=('!libtool')
 install=${pkgname}.install
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index 72cd37aca..6fcb594ba 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-mount-plugin
 pkgver=0.5.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin for the Xfce4 panel to mount and unmount volumes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index 13a03f4e2..fccd2750d 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=xfce4-mpc-plugin
 pkgver=0.3.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin to control the music player daemon from the xfce4-panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD
index 664a28a85..433476b62 100644
--- a/extra/xfce4-netload-plugin/PKGBUILD
+++ b/extra/xfce4-netload-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-netload-plugin
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="A netload plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD
index 889e1ac02..e4d2f3fff 100644
--- a/extra/xfce4-notes-plugin/PKGBUILD
+++ b/extra/xfce4-notes-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-notes-plugin
 pkgver=1.7.7
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A notes plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index 9ffefd291..b8e89437a 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-notifyd
 pkgver=0.2.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Notification daemon for the Xfce desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD
index 041ebf6a5..06aa739e4 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-panel
 pkgver=4.8.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Panel for the Xfce desktop environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index 9992fc0a4..d61157a7d 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-power-manager
 pkgver=1.0.10
-pkgrel=2
+pkgrel=2.1
 pkgdesc="power manager for xfce4 desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD
index d783ecf24..753317362 100644
--- a/extra/xfce4-quicklauncher-plugin/PKGBUILD
+++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-quicklauncher-plugin
 pkgver=1.9.4
-pkgrel=5
+pkgrel=5.1
 pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD
index ab636abd7..b20629bf4 100644
--- a/extra/xfce4-screenshooter/PKGBUILD
+++ b/extra/xfce4-screenshooter/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-screenshooter
 pkgver=1.8.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Plugin that makes screenshots for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index d2e465791..1a08005de 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.3
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A lm_sensors plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 1d17cce0c..a385ea3a8 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-session
 pkgver=4.8.2
-pkgrel=2
+pkgrel=3.1
 pkgdesc="A session manager for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index f17fd5727..42ac1fe14 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=xfce4-settings
 pkgver=4.8.3
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Settings manager for xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 1bfdd9253..c1d000134 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD
index a499ab317..11cba5978 100644
--- a/extra/xfce4-systemload-plugin/PKGBUILD
+++ b/extra/xfce4-systemload-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-systemload-plugin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A system load plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-taskmanager/PKGBUILD b/extra/xfce4-taskmanager/PKGBUILD
index 477abe743..975a78879 100644
--- a/extra/xfce4-taskmanager/PKGBUILD
+++ b/extra/xfce4-taskmanager/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xfce4-taskmanager
 pkgver=1.0.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Easy to use task manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD
index 119084172..5a8145735 100755
--- a/extra/xfce4-time-out-plugin/PKGBUILD
+++ b/extra/xfce4-time-out-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-time-out-plugin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Take a break from your computer with this plugin for XFCE4."
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 license=('GPL')
diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD
index 97abd1269..7e1932349 100644
--- a/extra/xfce4-timer-plugin/PKGBUILD
+++ b/extra/xfce4-timer-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-timer-plugin
 pkgver=0.6.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin to track time for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-verve-plugin/PKGBUILD b/extra/xfce4-verve-plugin/PKGBUILD
index 1c1586a0e..afdfbe32c 100644
--- a/extra/xfce4-verve-plugin/PKGBUILD
+++ b/extra/xfce4-verve-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-verve-plugin
 pkgver=1.0.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="command line plugin Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD
index 69976a7b2..b4cd88179 100644
--- a/extra/xfce4-wavelan-plugin/PKGBUILD
+++ b/extra/xfce4-wavelan-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-wavelan-plugin
 pkgver=0.5.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/"
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD
index b5ac7d8f1..4953361d5 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-weather-plugin
 pkgver=0.7.4
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A weather plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index a074d16fd..0c5af90db 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-xkb-plugin
 pkgver=0.5.4.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
 groups=('xfce4-goodies')
diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD
index f677e21d8..1f253d1d0 100644
--- a/extra/xfconf/PKGBUILD
+++ b/extra/xfconf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfconf
 pkgver=4.8.1
 pkgrel=1
 pkgdesc="A simple client-server configuration storage and query system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index e4853d4c5..f300f061c 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfdesktop
 pkgver=4.8.3
 pkgrel=1
 pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD
index 45c07d0dc..faf519d2d 100644
--- a/extra/xfig/PKGBUILD
+++ b/extra/xfig/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xfig
 pkgver=3.2.5b
 pkgrel=5
 pkgdesc="An interactive drawing tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfig.org/userman/"
 license=('custom')
 depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'desktop-file-utils' 'gsfonts')
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index 2a907e9ce..aa611a491 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfwm4
 pkgver=4.8.3
 pkgrel=1
 pkgdesc="Xfce window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 7447852b0..73c12fb8d 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xine-lib
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index d5ca4e7ee..30a5fe030 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xine-ui
 pkgver=0.99.6
 pkgrel=4
 pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.xine-project.org"
 depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm'
diff --git a/extra/xmahjongg/PKGBUILD b/extra/xmahjongg/PKGBUILD
index 56df4a23f..2e954d29d 100644
--- a/extra/xmahjongg/PKGBUILD
+++ b/extra/xmahjongg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xmahjongg
 pkgver=3.7
 pkgrel=4
 pkgdesc="Mahjongg game for X-Window"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lcdf.org/xmahjongg/"
 license=('GPL')
 depends=('gcc-libs' 'libx11')
diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD
index 283a541e8..88df6c5b0 100644
--- a/extra/xmlsec/PKGBUILD
+++ b/extra/xmlsec/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.18
 pkgrel=2
 pkgdesc="XML Security Library is a C library based on LibXML2"
 license=('custom')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.aleksey.com/xmlsec/index.html"
 depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool')
 makedepends=('pkgconfig')
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index 1edd4ebe3..d928fd237 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xmlto
 pkgver=0.0.25
 pkgrel=1
 pkgdesc="Convert xml to many other formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cyberelk.net/tim/software/xmlto/"
 license=('GPL')
 depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod')
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index 1a4e74b36..b8d68e532 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xmms
 pkgver=1.2.11
 pkgrel=4
 pkgdesc="The X MultiMedia System - a multimedia player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://legacy.xmms2.org/"
 license=('GPL')
 depends=('gtk' 'libxxf86vm' 'libsm' 'desktop-file-utils')
diff --git a/extra/xorg-appres/PKGBUILD b/extra/xorg-appres/PKGBUILD
index cc1583a0b..9af921b3b 100644
--- a/extra/xorg-appres/PKGBUILD
+++ b/extra/xorg-appres/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-appres
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="List X application resource database"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxt')
diff --git a/extra/xorg-bdftopcf/PKGBUILD b/extra/xorg-bdftopcf/PKGBUILD
index 0a6a35221..80920d665 100644
--- a/extra/xorg-bdftopcf/PKGBUILD
+++ b/extra/xorg-bdftopcf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-bdftopcf
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Convert X font from Bitmap Distribution Format to Portable Compiled Format"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfont')
diff --git a/extra/xorg-font-util/PKGBUILD b/extra/xorg-font-util/PKGBUILD
index d23ec52bc..09ec5570f 100644
--- a/extra/xorg-font-util/PKGBUILD
+++ b/extra/xorg-font-util/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-font-util
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="X.Org font utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 makedepends=('xorg-util-macros')
diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD
index 9063e3a4d..8af9aa2b0 100644
--- a/extra/xorg-iceauth/PKGBUILD
+++ b/extra/xorg-iceauth/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-iceauth
 pkgver=1.0.5
 pkgrel=1
 pkgdesc="ICE authority file utility"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libice')
diff --git a/extra/xorg-luit/PKGBUILD b/extra/xorg-luit/PKGBUILD
index 48b3446d8..3b7f03484 100644
--- a/extra/xorg-luit/PKGBUILD
+++ b/extra/xorg-luit/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.1.0
 pkgrel=2
 pkgdesc="Filter that can be run between an arbitrary application and
 a UTF-8 terminal emulator"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libfontenc')
diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD
index 883dc49b7..55bd8bf0f 100644
--- a/extra/xorg-mkfontscale/PKGBUILD
+++ b/extra/xorg-mkfontscale/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-mkfontscale
 pkgver=1.0.9
 pkgrel=1
 pkgdesc="Create an index of scalable font files for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('freetype2' 'libfontenc')
diff --git a/extra/xorg-oclock/PKGBUILD b/extra/xorg-oclock/PKGBUILD
index 5016247f2..0453c41e4 100644
--- a/extra/xorg-oclock/PKGBUILD
+++ b/extra/xorg-oclock/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-oclock
 pkgver=1.0.2
 pkgrel=1
 pkgdesc="Round X clock"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxext')
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 09463e789..510016849 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -5,10 +5,11 @@ pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.11.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt')
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'udev' 'libgcrypt')
+[ "$CARCH" = "mips64el" ] || makedepends+=('xf86driproto' 'dri2proto')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
@@ -18,7 +19,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xserver-1.11.2-record-crasher.patch
         xvfb-run
         xvfb-run.1
-        10-quirks.conf)
+        10-quirks.conf
+	loongson.patch)
 md5sums=('a7194c437963627e1db0dd2d6c1a1984'
          '6c7e87d63ac4b535e19a80c89d0cf091'
          'f8194638ca4872c2b0a67862a70bcebf'
@@ -26,7 +28,8 @@ md5sums=('a7194c437963627e1db0dd2d6c1a1984'
          '3f9de4dbfee2da90167192d8ca9eb2b4'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
+         'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
+         'd39c2e1a70bb4e400bb688cc74cd15f8')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -47,7 +50,38 @@ build() {
   # Upstream URL: http://patchwork.freedesktop.org/patch/7866/
   patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch"
 
+  # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
+  patch -Np1 -i "${srcdir}/loongson.patch"
+
   autoreconf -fi
+  if [ "$CARCH" = "mips64el" ]; then
+  ./configure --prefix=/usr \
+      --enable-ipv6 \
+      --disable-dri \
+      --disable-dri2 \
+      --enable-dmx \
+      --enable-xvfb \
+      --enable-xnest \
+      --enable-composite \
+      --enable-xcsecurity \
+      --enable-xorg \
+      --enable-xephyr \
+      --disable-glx \
+      --disable-glx-tls \
+      --enable-kdrive \
+      --enable-install-setuid \
+      --enable-config-udev \
+      --disable-config-dbus \
+      --enable-record \
+      --disable-xfbdev \
+      --disable-xfake \
+      --disable-static \
+      --sysconfdir=/etc/X11 \
+      --localstatedir=/var \
+      --with-xkb-path=/usr/share/X11/xkb \
+      --with-xkb-output=/var/lib/xkb \
+      --with-fontrootdir=/usr/share/fonts
+  else
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \
@@ -72,6 +106,7 @@ build() {
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
       --with-fontrootdir=/usr/share/fonts
+  fi
   make
 
   # Disable subdirs for make install rule to make splitting easier
@@ -115,9 +150,11 @@ package_xorg-server() {
 
   rmdir "${pkgdir}/usr/share/X11"
 
+  if [ "$CARCH" != "mips64el" ]; then
   # Needed for non-mesa drivers, libgl will restore it
   mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
      "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
+  fi
 
   rm -rf "${pkgdir}/var"
 
@@ -181,7 +218,8 @@ package_xorg-server-xdmx() {
 
 package_xorg-server-devel() {
   pkgdesc="Development files for the X.Org X server"
-  depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess)
+  depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto xineramaproto xorg-util-macros pixman libpciaccess)
+[ "$CARCH" = "mips64el" ] || depends+=('dri2proto')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch
new file mode 100644
index 000000000..b6c9692fc
--- /dev/null
+++ b/extra/xorg-server/loongson.patch
@@ -0,0 +1,49 @@
+diff -ru xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h xorg-server-1.11.2/hw/xfree86/dri/sarea.h
+--- xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h	2011-12-07 16:47:06.971237310 +0100
++++ xorg-server-1.11.2/hw/xfree86/dri/sarea.h	2011-12-07 16:48:40.132392770 +0100
+@@ -42,6 +42,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 			0x2000
++#elif defined(__mips__)
++#define SAREA_MAX                      0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000		/* 64kB */
+ #else
+diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
+--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2011-12-07 16:47:06.967237429 +0100
++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c	2011-12-07 16:52:33.200881187 +0100
+@@ -493,9 +493,10 @@
+ Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ 	int fd;
+ 	unsigned int ioBase_phys;
++	extern unsigned int IOPortBase;
+ #endif
+ 
+ 	if (ExtendedEnabled)
+@@ -520,6 +521,21 @@
+ #endif
+ 	}
+ 	close(fd);
++#elif defined(__mips__)
++	fd = open("/dev/mem", O_RDWR);
++	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++			PROT_READ | PROT_WRITE, MAP_SHARED, fd,
++			0x1fd00000);
++	if (IOPortBase == MAP_FAILED) {
++		xf86Msg(X_WARNING,
++				"xf86EnableIOPorts: Failed to map iobase (%s)\n",
++				strerror(errno));
++		return FALSE;
++	}
++	close(fd);
++	xf86Msg(X_WARNING,
++		"xf86EnableIOPorts: map iobase (%x)\n",
++		IOPortBase);
+ #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
+         if (ioperm(0, 1024, 1) || iopl(3)) {
+                 if (errno == ENODEV)
diff --git a/extra/xorg-server/vbe-fix-malloc-size-bug.patch b/extra/xorg-server/vbe-fix-malloc-size-bug.patch
new file mode 100644
index 000000000..01ed040d4
--- /dev/null
+++ b/extra/xorg-server/vbe-fix-malloc-size-bug.patch
@@ -0,0 +1,39 @@
+From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 24 Feb 2011 21:06:34 +0000
+Subject: vbe: Fix malloc size bug
+
+v2: Slightly more obvious sizing math.
+
+==14882== Invalid write of size 2
+==14882==    at 0x6750267: VBEGetVBEInfo (vbe.c:400)
+==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
+==14882==    by 0x471895: InitOutput (xf86Init.c:519)
+==14882==    by 0x422778: main (main.c:205)
+==14882==  Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd
+==14882==    at 0x4A0640D: malloc (vg_replace_malloc.c:236)
+==14882==    by 0x675024B: VBEGetVBEInfo (vbe.c:398)
+==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
+==14882==    by 0x471895: InitOutput (xf86Init.c:519)
+==14882==    by 0x422778: main (main.c:205)
+
+Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534)
+---
+diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
+index 7a64a4a..1d3775b 100644
+--- a/hw/xfree86/vbe/vbe.c
++++ b/hw/xfree86/vbe/vbe.c
+@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
+     i = 0;
+     while (modes[i] != 0xffff)
+ 	i++;
+-    block->VideoModePtr = malloc(sizeof(CARD16) * i + 1);
++    block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));
+     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);
+     block->VideoModePtr[i] = 0xffff;
+ 
+--
+cgit v0.8.3-6-g21f6
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index aa97c8ffd..e7b850a1d 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-sessreg
 pkgver=1.0.7
 pkgrel=1
 pkgdesc="Register X sessions in system utmp/utmpx databases"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xorg-setxkbmap/PKGBUILD b/extra/xorg-setxkbmap/PKGBUILD
index b25f37dc1..2aceaead9 100644
--- a/extra/xorg-setxkbmap/PKGBUILD
+++ b/extra/xorg-setxkbmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-setxkbmap
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="Set the keyboard using the X Keyboard Extension"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-smproxy/PKGBUILD b/extra/xorg-smproxy/PKGBUILD
index d8c25e0a4..ba53babaa 100644
--- a/extra/xorg-smproxy/PKGBUILD
+++ b/extra/xorg-smproxy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-smproxy
 pkgver=1.0.5
 pkgrel=1
 pkgdesc="Allows X applications that do not support X11R6 session management to participate in an X11R6 session"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libxt' 'libxmu')
diff --git a/extra/xorg-twm/PKGBUILD b/extra/xorg-twm/PKGBUILD
index d77f13207..94e32f41b 100644
--- a/extra/xorg-twm/PKGBUILD
+++ b/extra/xorg-twm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-twm
 pkgver=1.0.7
 pkgrel=1
 pkgdesc="Tab Window Manager for the X Window System"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 backup=(etc/X11/twm/system.twmrc)
 license=('custom')
diff --git a/extra/xorg-x11perf/PKGBUILD b/extra/xorg-x11perf/PKGBUILD
index 7c7479dca..489dac0b2 100644
--- a/extra/xorg-x11perf/PKGBUILD
+++ b/extra/xorg-x11perf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-x11perf
 pkgver=1.5.4
 pkgrel=1
 pkgdesc="Simple X server performance benchmarker"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxrender' 'libxft' 'libxext')
diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD
index 192dcce39..fc3b2bb16 100644
--- a/extra/xorg-xauth/PKGBUILD
+++ b/extra/xorg-xauth/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xauth
 pkgver=1.0.6
 pkgrel=1
 pkgdesc="X.Org authorization settings program"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxmu')
diff --git a/extra/xorg-xbacklight/PKGBUILD b/extra/xorg-xbacklight/PKGBUILD
index 5ed14c78c..2b1a3c230 100644
--- a/extra/xorg-xbacklight/PKGBUILD
+++ b/extra/xorg-xbacklight/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xbacklight
 pkgver=1.1.2
 pkgrel=2
 pkgdesc="RandR-based backlight control application"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxrandr' 'libx11')
diff --git a/extra/xorg-xbiff/PKGBUILD b/extra/xorg-xbiff/PKGBUILD
index 60c750ed2..47bd31dd8 100644
--- a/extra/xorg-xbiff/PKGBUILD
+++ b/extra/xorg-xbiff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xbiff
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Watch mailboxes for new message delivery"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxext')
diff --git a/extra/xorg-xcalc/PKGBUILD b/extra/xorg-xcalc/PKGBUILD
index 8272a7965..d4d16a8c4 100644
--- a/extra/xorg-xcalc/PKGBUILD
+++ b/extra/xorg-xcalc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcalc
 pkgver=1.0.4.1
 pkgrel=1
 pkgdesc="Scientific calculator for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw')
diff --git a/extra/xorg-xclipboard/PKGBUILD b/extra/xorg-xclipboard/PKGBUILD
index 08f506c42..60c4d624b 100644
--- a/extra/xorg-xclipboard/PKGBUILD
+++ b/extra/xorg-xclipboard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xclipboard
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X clipboard manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD
index db6506846..f3d2ee24e 100644
--- a/extra/xorg-xclock/PKGBUILD
+++ b/extra/xorg-xclock/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xclock
 pkgver=1.0.5
 pkgrel=1
 pkgdesc="X clock"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile')
diff --git a/extra/xorg-xcmsdb/PKGBUILD b/extra/xorg-xcmsdb/PKGBUILD
index 58fdd734f..9687e02fb 100644
--- a/extra/xorg-xcmsdb/PKGBUILD
+++ b/extra/xorg-xcmsdb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcmsdb
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="Device Color Characterization utility for X Color Management System"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD
index 204892339..1ecc9eeac 100644
--- a/extra/xorg-xconsole/PKGBUILD
+++ b/extra/xorg-xconsole/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xconsole
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="Monitor system console messages with X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xcursorgen/PKGBUILD b/extra/xorg-xcursorgen/PKGBUILD
index f798e9591..31e374a1d 100644
--- a/extra/xorg-xcursorgen/PKGBUILD
+++ b/extra/xorg-xcursorgen/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcursorgen
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Create an X cursor file from PNG images"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxcursor' 'libpng')
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index 1edcddd16..ac47ef1e2 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdm
 pkgver=1.1.11
 pkgrel=1
 pkgdesc="X Display Manager"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit')
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index b4101251d..48c4b5ae9 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdpyinfo
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="Display information utility for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'libxcomposite' 'libxinerama' 'libdmx')
diff --git a/extra/xorg-xdriinfo/PKGBUILD b/extra/xorg-xdriinfo/PKGBUILD
index 643fe2e93..f247c07ee 100644
--- a/extra/xorg-xdriinfo/PKGBUILD
+++ b/extra/xorg-xdriinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdriinfo
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Query configuration information of DRI drivers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libgl')
diff --git a/extra/xorg-xedit/PKGBUILD b/extra/xorg-xedit/PKGBUILD
index b6a7dbf41..d9f9d49d7 100644
--- a/extra/xorg-xedit/PKGBUILD
+++ b/extra/xorg-xedit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xedit
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="Simple text editor for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD
index 70f75e86b..7e981106a 100644
--- a/extra/xorg-xev/PKGBUILD
+++ b/extra/xorg-xev/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xev
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="Print contents of X events"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xeyes/PKGBUILD b/extra/xorg-xeyes/PKGBUILD
index aea051d3a..5c18175bb 100644
--- a/extra/xorg-xeyes/PKGBUILD
+++ b/extra/xorg-xeyes/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xeyes
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="Follow the mouse/SHAPE extension X demo"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxt' 'libxext' 'libxmu' 'libxrender')
diff --git a/extra/xorg-xfd/PKGBUILD b/extra/xorg-xfd/PKGBUILD
index 8d7aec33c..5c4bba1c6 100644
--- a/extra/xorg-xfd/PKGBUILD
+++ b/extra/xorg-xfd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xfd
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="Displays all the characters in a font using either the X11 core protocol or libXft2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'fontconfig' 'libxft' 'libxrender' 'libxmu')
diff --git a/extra/xorg-xfontsel/PKGBUILD b/extra/xorg-xfontsel/PKGBUILD
index cca0d453e..827003048 100644
--- a/extra/xorg-xfontsel/PKGBUILD
+++ b/extra/xorg-xfontsel/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xfontsel
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Point and click selection of X11 font names"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xfs/PKGBUILD b/extra/xorg-xfs/PKGBUILD
index 606076b8f..cb7244db9 100644
--- a/extra/xorg-xfs/PKGBUILD
+++ b/extra/xorg-xfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xfs
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X.Org X11 xfs font server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 backup=('etc/X11/fs/config')
diff --git a/extra/xorg-xgamma/PKGBUILD b/extra/xorg-xgamma/PKGBUILD
index a1cfff2aa..fd9a43f7c 100644
--- a/extra/xorg-xgamma/PKGBUILD
+++ b/extra/xorg-xgamma/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xgamma
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Alter a monitor's gamma correction"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxxf86vm')
diff --git a/extra/xorg-xhost/PKGBUILD b/extra/xorg-xhost/PKGBUILD
index 99f1f3399..82519eab8 100644
--- a/extra/xorg-xhost/PKGBUILD
+++ b/extra/xorg-xhost/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xhost
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Server access control program for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu')
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index edb93716e..982c75feb 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xinit
 pkgver=1.3.1
 pkgrel=2
 pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libx11' 'xorg-xauth' 'inetutils')
diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD
index e0c49d36e..a7afa3c17 100644
--- a/extra/xorg-xinput/PKGBUILD
+++ b/extra/xorg-xinput/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xinput
 pkgver=1.5.3
 pkgrel=2
 pkgdesc="Small commandline tool to configure devices"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxi')
diff --git a/extra/xorg-xkbcomp/PKGBUILD b/extra/xorg-xkbcomp/PKGBUILD
index dc2ec9c89..058840aac 100644
--- a/extra/xorg-xkbcomp/PKGBUILD
+++ b/extra/xorg-xkbcomp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbcomp
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="X Keyboard description compiler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-xkbevd/PKGBUILD b/extra/xorg-xkbevd/PKGBUILD
index 35ac08075..e95a0944d 100644
--- a/extra/xorg-xkbevd/PKGBUILD
+++ b/extra/xorg-xkbevd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbevd
 pkgver=1.1.2
 pkgrel=2
 pkgdesc="XKB event daemon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-xkbutils/PKGBUILD b/extra/xorg-xkbutils/PKGBUILD
index 5b3d3be12..81e2c9050 100644
--- a/extra/xorg-xkbutils/PKGBUILD
+++ b/extra/xorg-xkbutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbutils
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="XKB utility demos"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxt' 'libx11')
diff --git a/extra/xorg-xkill/PKGBUILD b/extra/xorg-xkill/PKGBUILD
index b1dbbe639..a2b3f1580 100644
--- a/extra/xorg-xkill/PKGBUILD
+++ b/extra/xorg-xkill/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkill
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="Kill a client by its X resource"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu')
diff --git a/extra/xorg-xload/PKGBUILD b/extra/xorg-xload/PKGBUILD
index f61b7d877..1451a91a0 100644
--- a/extra/xorg-xload/PKGBUILD
+++ b/extra/xorg-xload/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xload
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="System load average display for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xlogo/PKGBUILD b/extra/xorg-xlogo/PKGBUILD
index 114933c16..56fbc99e2 100644
--- a/extra/xorg-xlogo/PKGBUILD
+++ b/extra/xorg-xlogo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlogo
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Draw [old] X logo"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libxaw' 'libxmu' 'libxt' 'libxext' 'libx11' 'libxrender' 'libxft')
diff --git a/extra/xorg-xlsatoms/PKGBUILD b/extra/xorg-xlsatoms/PKGBUILD
index dd88c8c9a..9a7f32f6e 100644
--- a/extra/xorg-xlsatoms/PKGBUILD
+++ b/extra/xorg-xlsatoms/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlsatoms
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="List interned atoms defined on server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcb')
diff --git a/extra/xorg-xlsclients/PKGBUILD b/extra/xorg-xlsclients/PKGBUILD
index d0b5ac155..efae30be0 100644
--- a/extra/xorg-xlsclients/PKGBUILD
+++ b/extra/xorg-xlsclients/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlsclients
 pkgver=1.1.2
 pkgrel=1
 pkgdesc="List client applications running on a display"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcb')
diff --git a/extra/xorg-xmag/PKGBUILD b/extra/xorg-xmag/PKGBUILD
index 66dafe737..4e3728a34 100644
--- a/extra/xorg-xmag/PKGBUILD
+++ b/extra/xorg-xmag/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmag
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="Magnify parts of the screen"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xman/PKGBUILD b/extra/xorg-xman/PKGBUILD
index 77bb96546..d56b4fe44 100644
--- a/extra/xorg-xman/PKGBUILD
+++ b/extra/xorg-xman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xman
 pkgver=1.1.2
 pkgrel=1
 pkgdesc="Unix manual page viewer"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxt')
diff --git a/extra/xorg-xmessage/PKGBUILD b/extra/xorg-xmessage/PKGBUILD
index ca10a8d57..82c3fe420 100644
--- a/extra/xorg-xmessage/PKGBUILD
+++ b/extra/xorg-xmessage/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmessage
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Display a message or query in a window"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw')
diff --git a/extra/xorg-xmodmap/PKGBUILD b/extra/xorg-xmodmap/PKGBUILD
index 6f8f31e4f..92942a1e3 100644
--- a/extra/xorg-xmodmap/PKGBUILD
+++ b/extra/xorg-xmodmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmodmap
 pkgver=1.0.5
 pkgrel=2
 pkgdesc="Utility for modifying keymaps and button mappings"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xpr/PKGBUILD b/extra/xorg-xpr/PKGBUILD
index 47ed9440b..6bd56b68f 100644
--- a/extra/xorg-xpr/PKGBUILD
+++ b/extra/xorg-xpr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xpr
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="Print an X window dump from xwd"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu')
diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD
index 32e121164..ae86243b8 100644
--- a/extra/xorg-xprop/PKGBUILD
+++ b/extra/xorg-xprop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xprop
 pkgver=1.2.1
 pkgrel=1
 pkgdesc="Property displayer for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD
index a208b1ee3..f15457c98 100644
--- a/extra/xorg-xrandr/PKGBUILD
+++ b/extra/xorg-xrandr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xrandr
 pkgver=1.3.5
 pkgrel=1
 pkgdesc="Primitive command line interface to RandR extension"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxrandr' 'libx11')
diff --git a/extra/xorg-xrdb/PKGBUILD b/extra/xorg-xrdb/PKGBUILD
index 5e404714a..a1e0d6f50 100644
--- a/extra/xorg-xrdb/PKGBUILD
+++ b/extra/xorg-xrdb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 118463 2011-04-07 07:16:02Z jgc $
+# $Id: PKGBUILD 113821 2011-03-10 15:52:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xrdb
-pkgver=1.0.9
-pkgrel=1
+pkgver=1.0.8
+pkgrel=2
 pkgdesc="X server resource database utility"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'mcpp')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
-sha1sums=('efa5f2420411988d6a6e142934393fd272507857')
+sha1sums=('9bfdd09a2b303b962439910f7bccaddd69b6ca8a')
 
 build() {
   cd "${srcdir}/xrdb-${pkgver}"
diff --git a/extra/xorg-xrefresh/PKGBUILD b/extra/xorg-xrefresh/PKGBUILD
index 74d49b040..de950df12 100644
--- a/extra/xorg-xrefresh/PKGBUILD
+++ b/extra/xorg-xrefresh/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xrefresh
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Refresh all or part of an X screen"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xset/PKGBUILD b/extra/xorg-xset/PKGBUILD
index e483f0646..7e0c40c51 100644
--- a/extra/xorg-xset/PKGBUILD
+++ b/extra/xorg-xset/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xset
 pkgver=1.2.2
 pkgrel=1
 pkgdesc="User preference utility for X"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxmu')
diff --git a/extra/xorg-xsetroot/PKGBUILD b/extra/xorg-xsetroot/PKGBUILD
index 35b800dca..3758d9c6a 100644
--- a/extra/xorg-xsetroot/PKGBUILD
+++ b/extra/xorg-xsetroot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xsetroot
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="Classic X utility to set your root window background to a given pattern or color"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxmu' 'libx11' 'libxcursor')
diff --git a/extra/xorg-xvidtune/PKGBUILD b/extra/xorg-xvidtune/PKGBUILD
index 308b8088d..e7426b638 100644
--- a/extra/xorg-xvidtune/PKGBUILD
+++ b/extra/xorg-xvidtune/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xvidtune
 pkgver=1.0.2
 pkgrel=1
 pkgdesc="Video mode tuner for Xorg"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxxf86vm' 'libxt' 'libxaw' 'libxmu' 'libx11')
diff --git a/extra/xorg-xvinfo/PKGBUILD b/extra/xorg-xvinfo/PKGBUILD
index f125fa32d..4684113fb 100644
--- a/extra/xorg-xvinfo/PKGBUILD
+++ b/extra/xorg-xvinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xvinfo
 pkgver=1.1.1
 pkgrel=2
 pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxv')
diff --git a/extra/xorg-xwd/PKGBUILD b/extra/xorg-xwd/PKGBUILD
index 1634c5d93..a4de8a9f1 100644
--- a/extra/xorg-xwd/PKGBUILD
+++ b/extra/xorg-xwd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwd
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="X Window System image dumping utility"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD
index 1e16302d1..59fcd44af 100644
--- a/extra/xorg-xwininfo/PKGBUILD
+++ b/extra/xorg-xwininfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwininfo
 pkgver=1.1.2
 pkgrel=1
 pkgdesc="Command-line utility to print information about windows on an X server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcb')
diff --git a/extra/xorg-xwud/PKGBUILD b/extra/xorg-xwud/PKGBUILD
index c7c593386..5b7a4a430 100644
--- a/extra/xorg-xwud/PKGBUILD
+++ b/extra/xorg-xwud/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwud
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="X Window System image undumping utility"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xournal/PKGBUILD b/extra/xournal/PKGBUILD
index 79f6f7c93..76d0c7f1c 100644
--- a/extra/xournal/PKGBUILD
+++ b/extra/xournal/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xournal
 pkgver=0.4.5
 pkgrel=5
 pkgdesc='Notetaking and sketching application'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://xournal.sourceforge.net/'
 license=('GPL')
 depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD
index 12e63382c..d5034ea67 100644
--- a/extra/xpdf/PKGBUILD
+++ b/extra/xpdf/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='http://www.foolabs.com/xpdf/'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('lesstif' 'gsfonts' 'libxt')
 optdepends=('poppler: tools that used to be included in xpdf'
             'desktop-file-utils: for desktop environments')
diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index 531985301..0a0f1c527 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
 pkgver=0.998
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.xsane.org"
 license=('GPL2')
 makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
index 04259d150..9c38f0f45 100644
--- a/extra/xscreensaver/PKGBUILD
+++ b/extra/xscreensaver/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xscreensaver
 pkgver=5.15
 pkgrel=3
 pkgdesc="Screen saver and locker for the X Window System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
 depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
index 85730ab32..3e0a1b614 100644
--- a/extra/xsp/PKGBUILD
+++ b/extra/xsp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xsp
 pkgver=2.10.2
 pkgrel=1
 pkgdesc="A simple webserver based on mono - provides ASP.NET support"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://www.go-mono.com"
 depends=('mono>=2.10.2' 'sqlite3')
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index d9a74afbd..4f4e269a8 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xterm
 pkgver=278
 pkgrel=1
 pkgdesc="X Terminal Emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/xterm/"
 license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index d0448db77..a387ab785 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -5,13 +5,14 @@ pkgname=xulrunner
 pkgver=9.0.1
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 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
+        mips.patch
         mozilla-pkgconfig.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
@@ -23,6 +24,11 @@ build() {
   cd "$srcdir/mozilla-release"
   cp "$srcdir/mozconfig" .mozconfig
 
+  [[ "$CARCH" == "mips64el" ]] && {
+    echo "ac_add_options --disable-ipc" >> .mozconfig
+    patch -Np0 -i "${srcdir}/mips.patch"
+  }
+
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
 
diff --git a/extra/xulrunner/mips.patch b/extra/xulrunner/mips.patch
new file mode 100644
index 000000000..f9de910b2
--- /dev/null
+++ b/extra/xulrunner/mips.patch
@@ -0,0 +1,114 @@
+--- ../../tmp.ne6Bz1oy72/xulrunner/src/mozilla-2.0/js/src/assembler/jit/ExecutableAllocator.h	2011-03-18 20:33:47.000000000 -0300
++++ js/src/assembler/jit/ExecutableAllocator.h	2011-03-30 15:45:07.537247142 -0300
+@@ -44,9 +44,7 @@
+ #include <e32std.h>
+ #endif
+ 
+-#if WTF_CPU_MIPS && WTF_PLATFORM_LINUX
+ #include <sys/cachectl.h>
+-#endif
+ 
+ #if WTF_PLATFORM_WINCE
+ // From pkfuncs.h (private header file from the Platform Builder)
+@@ -311,89 +309,10 @@
+ #endif
+ 
+ 
+-#if WTF_CPU_X86 || WTF_CPU_X86_64
+-    static void cacheFlush(void*, size_t)
+-    {
+-    }
+-#elif WTF_CPU_MIPS
+     static void cacheFlush(void* code, size_t size)
+     {
+-#if WTF_COMPILER_GCC && (GCC_VERSION >= 40300)
+-#if WTF_MIPS_ISA_REV(2) && (GCC_VERSION < 40403)
+-        int lineSize;
+-        asm("rdhwr %0, $1" : "=r" (lineSize));
+-        //
+-        // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in
+-        // mips_expand_synci_loop that may execute synci one more time.
+-        // "start" points to the fisrt byte of the cache line.
+-        // "end" points to the last byte of the line before the last cache line.
+-        // Because size is always a multiple of 4, this is safe to set
+-        // "end" to the last byte.
+-        //
+-        intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize);
+-        intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1;
+-        __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end));
+-#else
+-        intptr_t end = reinterpret_cast<intptr_t>(code) + size;
+-        __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
+-#endif
+-#else
+         _flush_cache(reinterpret_cast<char*>(code), size, BCACHE);
+-#endif
+-    }
+-#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_IPHONE
+-    static void cacheFlush(void* code, size_t size)
+-    {
+-        sys_dcache_flush(code, size);
+-        sys_icache_invalidate(code, size);
+-    }
+-#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_LINUX
+-    static void cacheFlush(void* code, size_t size)
+-    {
+-        asm volatile (
+-            "push    {r7}\n"
+-            "mov     r0, %0\n"
+-            "mov     r1, %1\n"
+-            "movw    r7, #0x2\n"
+-            "movt    r7, #0xf\n"
+-            "movs    r2, #0x0\n"
+-            "svc     0x0\n"
+-            "pop     {r7}\n"
+-            :
+-            : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
+-            : "r0", "r1", "r2");
+-    }
+-#elif WTF_PLATFORM_SYMBIAN
+-    static void cacheFlush(void* code, size_t size)
+-    {
+-        User::IMB_Range(code, static_cast<char*>(code) + size);
+-    }
+-#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT
+-    static __asm void cacheFlush(void* code, size_t size);
+-#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC
+-    static void cacheFlush(void* code, size_t size)
+-    {
+-        asm volatile (
+-            "push    {r7}\n"
+-            "mov     r0, %0\n"
+-            "mov     r1, %1\n"
+-            "mov     r7, #0xf0000\n"
+-            "add     r7, r7, #0x2\n"
+-            "mov     r2, #0x0\n"
+-            "svc     0x0\n"
+-            "pop     {r7}\n"
+-            :
+-            : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
+-            : "r0", "r1", "r2");
+-    }
+-#elif WTF_PLATFORM_WINCE
+-    static void cacheFlush(void* code, size_t size)
+-    {
+-        CacheRangeFlush(code, size, CACHE_SYNC_ALL);
+     }
+-#else
+-    #error "The cacheFlush support is missing on this platform."
+-#endif
+ 
+ private:
+ 
+--- js/src/Makefile.in.orig	2011-03-30 22:02:39.725318514 -0300
++++ js/src/Makefile.in	2011-03-30 22:02:51.689347820 -0300
+@@ -914,7 +914,7 @@
+ # Needed to "configure" it correctly.  Unfortunately these
+ # flags wind up being applied to all code in js/src, not just
+ # the code in js/src/assembler.
+-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_JIT=1
+ 
+ INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
+ 
+
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index 360ddd8aa..924265186 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xvidcore
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xvid.org/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/yakuake/PKGBUILD b/extra/yakuake/PKGBUILD
index 6fe44c6cb..be80c0c5b 100644
--- a/extra/yakuake/PKGBUILD
+++ b/extra/yakuake/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yakuake
 pkgver=2.9.8
 pkgrel=1
 pkgdesc="A KDE konsole application with the look and feel of that in the Quake engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://yakuake.kde.org"
 license=('GPL')
 depends=('kdebase-konsole')
diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD
index 0affd661c..88c6e535b 100644
--- a/extra/yasm/PKGBUILD
+++ b/extra/yasm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yasm
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.tortall.net/projects/yasm/"
 depends=('glibc')
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 2d6ecc158..bcc94143e 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=yelp
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf')
 makedepends=('intltool' 'gtk-doc')
 groups=('gnome')
diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index 8cf4b6960..d17e30adc 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yp-tools
 pkgver=2.12
 pkgrel=2
 pkgdesc='Linux NIS Tools'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linux-nis.org/nis/yp-tools/'
 license=('GPL2')
 depends=('ypbind-mt')
diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD
index 60df94219..279d11481 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc='Linux NIS daemon'
 url='http://www.linux-nis.org/nis/ypbind-mt/'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('networkmanager')
 depends=('rpcbind' 'openslp' 'dbus-glib')
 optdepends=('yp-tools: to set a domain name')
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index a99ca0501..134c34643 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ypserv
 pkgver=2.26
 pkgrel=3
 pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linux-nis.org/nis/ypserv/'
 license=('GPL2')
 depends=('gdbm' 'openslp' 'inetutils')
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index eece8d587..13b8b846a 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=zenity
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'libnotify')
 makedepends=('intltool' 'gtk-doc')
diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD
index 960b19cbf..505c92c23 100644
--- a/extra/zile/PKGBUILD
+++ b/extra/zile/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=zile
 pkgver=2.4.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A small, fast, and powerful Emacs clone"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/zile/"
 # Lua is not required, the author uses it to generate some source files.
 depends=('gc' 'ncurses')
diff --git a/extra/zip/PKGBUILD b/extra/zip/PKGBUILD
index 6d13a1917..ecf3e02a5 100644
--- a/extra/zip/PKGBUILD
+++ b/extra/zip/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.0
 _pkgver=30
 pkgrel=2
 pkgdesc="Creates PKZIP-compatible .zip files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.info-zip.org/pub/infozip/Zip.html"
 license=('BSD')
 depends=('bzip2')
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index f34e49306..628be7fe5 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=zsh
 pkgver=4.3.15
 pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
 license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index 8ad534a47..4f3dd1622 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.2.33
 pkgrel=3
 pkgdesc="VBI capture and decoding library"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('libpng' 'libx11')
 license=('GPL')
 options=('!libtool')
diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD
index 4783fc5ee..73d728632 100644
--- a/extra/zziplib/PKGBUILD
+++ b/extra/zziplib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zziplib
 pkgver=0.13.60
 pkgrel=1
 pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zziplib.sourceforge.net"
 license=('LGPL' 'MPL')
 depends=('zlib')
diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD
deleted file mode 100644
index 98b8acd28..000000000
--- a/kde-unstable/calligra/PKGBUILD
+++ /dev/null
@@ -1,275 +0,0 @@
-# $Id: PKGBUILD 146515 2012-01-12 08:10:29Z andrea $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=calligra
-pkgname=('calligra-filters'
-         'calligra-interfaces'
-         'calligra-libs'
-         'calligra-plugins'
-         'calligra-pics'
-         'calligra-servicetypes'
-         'calligra-templates'
-         'calligra-tools'
-         'calligra-karbon'
-         'calligra-kexi'
-         'calligra-kounavail'
-         'calligra-plan'
-         'calligra-stage'
-         'calligra-krita'
-         'calligra-tables'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-thesaurus-doc'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.3.86
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org'
-license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf'
-             'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4'
-             'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
-groups=('calligra')
-source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('1c2d073846089a812cb9ebd43c4b6b56')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_active=OFF \
-    -DBUILD_mobile=OFF \
-    -DBUILD_mysql=OFF \
-    -DKDCRAW_LOCAL_FOUND=/usr/lib/libkdcraw.so \
-    -DWITH_Marble=OFF
-  make
-}
-
-package_calligra-filters() {
-  pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libgsf: Microsoft Word document importer'
-              'libwpd: WordPerfect document importer'
-              'libwpg: Corel WordPerfect Graphics image importer'
-              'pstoedit: Karbon EPS import filter'
-              'libkdcraw: support for raw images')
-  conflicts=('koffice-filters')
-  replaces=('koffice-filters')
-  install=calligra-filters.install
-
-  cd "${srcdir}"/build/filters
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-interfaces() {
-  pkgdesc="Interfaces for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-interfaces')
-  replaces=('koffice-interfaces')
-
-  cd "${srcdir}"/build/interfaces
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-libs() {
-  pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes')
-  conflicts=('koffice-libs')
-  replaces=('koffice-libs')
-
-  cd "${srcdir}"/build/libs
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-plugins() {
-  pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart')
-
-  cd "${srcdir}"/build/plugins
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-pics() {
-  pkgdesc="Icons for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-pics')
-  replaces=('koffice-pics')
-  install=calligra.install
-
-  cd "${srcdir}"/build/pics
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-servicetypes() {
-  pkgdesc="Servicetypes for the Calligra office suite"
-  conflicts=('koffice-servicetypes')
-  replaces=('koffice-servicetypes')
-  install=calligra.install
-
-  cd "${srcdir}"/build/servicetypes
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-templates() {
-  pkgdesc="Templates for the Calligra office suite"
-  conflicts=('koffice-templates')
-  replaces=('koffice-templates')
-
-  cd "${srcdir}"/build/templates
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-tools() {
-  pkgdesc="Tools for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-tools')
-  replaces=('koffice-tools')
-  install=calligra-tools.install
-
-  cd "${srcdir}"/build/tools
-  make DESTDIR="${pkgdir}" install
-}
-
-#### package common files done #####
-
-#### package apps and their docs #####
-
-package_calligra-karbon() {
-  pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'calligra-templates')
-  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  install=calligra-karbon.install
-
-  cd "${srcdir}"/build/karbon
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kexi() {
-  pkgdesc="Develop desktop database applications"
-  depends=('calligra-libs' 'calligra-templates')
-  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  install=calligra-kexi.install
-
-  cd "${srcdir}"/build/kexi
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kounavail() {
-  pkgdesc="Unavailable Calligra Document"
-  depends=('calligra-libs')
-  conflicts=('koffice-kounavail')
-  replaces=('koffice-kounavail')
-
-  cd "${srcdir}"/build/kounavail
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-plan() {
-  pkgdesc="Calligra Project Management Component"
-  depends=('calligra-words')
-  conflicts=('koffice-kplato' 'calligra-kplato')
-  replaces=('koffice-kplato' 'calligra-kplato')
-  install=calligra-plan.install
-
-  cd "${srcdir}"/build/plan
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-stage() {
-  pkgdesc="Write presentation documents"
-  depends=('calligra-libs' 'calligra-templates')
-  optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  install=calligra-stage.install
-
-  cd "${srcdir}"/build/stage
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-krita() {
-  pkgdesc="Edit and paint images"
-  depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew'
-           'qimageblitz' 'poppler-qt' 'openexr' 'opengtl')
-  optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-krita' 'calligra-krita-doc')
-  replaces=('koffice-krita' 'calligra-krita-doc')
-  install=calligra-krita.install
-
-  cd "${srcdir}"/build/krita
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-tables() {
-  pkgdesc="Write spreadsheet documents"
-  depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl')
-  optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc')
-  install=calligra-tables.install
-
-  cd "${srcdir}"/build/tables
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/tables
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-words() {
-  pkgdesc="Word Processor"
-  depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics'
-           'calligra-kounavail' 'kdegraphics-okular')
-  optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-kword')
-  replaces=('koffice-kword')
-  install=calligra-words.install
-
-  cd "${srcdir}"/build/words
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-handbook() {
-  pkgdesc="Documentation for Calligra"
-  conflicts=('koffice-handbook')
-  replaces=('koffice-handbook')
-
-  cd "${srcdir}"/build/doc/calligra
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-thesaurus-doc() {
-  pkgdesc="Documentation for Thesaurus"
-  conflicts=('koffice-thesaurus-doc')
-  replaces=('koffice-thesaurus-doc')
-
-  cd "${srcdir}"/build/doc/thesaurus
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-braindump() {
-  pkgdesc="Notes and idea gathering"
-  install=calligra-braindump.install
-
-  cd "${srcdir}"/build/braindump
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-flow() {
-  pkgdesc="Flowchart & Diagram Editing"
-  install=calligra-flow.install
-  conflicts=('calligra-flow-doc')
-  replaces=('calligra-flow-doc')
-
-  cd "${srcdir}"/build/flow
-  make DESTDIR="${pkgdir}" install
-}
-
-##### package apps done #####
diff --git a/kde-unstable/calligra/calligra-braindump.install b/kde-unstable/calligra/calligra-braindump.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/kde-unstable/calligra/calligra-braindump.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/calligra/calligra-filters.install b/kde-unstable/calligra/calligra-filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/kde-unstable/calligra/calligra-filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra-flow.install b/kde-unstable/calligra/calligra-flow.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/calligra/calligra-flow.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra-karbon.install b/kde-unstable/calligra/calligra-karbon.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/kde-unstable/calligra/calligra-karbon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/calligra/calligra-kexi.install b/kde-unstable/calligra/calligra-kexi.install
deleted file mode 100644
index b8c7ebf27..000000000
--- a/kde-unstable/calligra/calligra-kexi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra-krita.install b/kde-unstable/calligra/calligra-krita.install
deleted file mode 100644
index 33d234a02..000000000
--- a/kde-unstable/calligra/calligra-krita.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/calligra/calligra-plan.install b/kde-unstable/calligra/calligra-plan.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/kde-unstable/calligra/calligra-plan.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/kde-unstable/calligra/calligra-stage.install b/kde-unstable/calligra/calligra-stage.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/calligra/calligra-stage.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra-tables.install b/kde-unstable/calligra/calligra-tables.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/calligra/calligra-tables.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra-tools.install b/kde-unstable/calligra/calligra-tools.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/calligra/calligra-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra-words.install b/kde-unstable/calligra/calligra-words.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/calligra/calligra-words.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/calligra/calligra.install b/kde-unstable/calligra/calligra.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/calligra/calligra.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/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-testing/b43-tools-git/PKGBUILD b/libre-testing/b43-tools-git/PKGBUILD
index 42e331f7b..030f535ac 100644
--- a/libre-testing/b43-tools-git/PKGBUILD
+++ b/libre-testing/b43-tools-git/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=b43-tools-git
 pkgver=20110214
 pkgrel=1
 pkgdesc="Tools for the Broadcom 43xx series WLAN chip."
-arch=('i686' 'x86_64' 'ppc')
+arch=('i686' 'x86_64' 'ppc' 'mips64el')
 url="http://bu3sch.de/gitweb?p=b43-tools.git;a=summary"
 license=('GPL2' 'GPL3')
 depends=('python2')
diff --git a/libre-testing/unace-libre/PKGBUILD b/libre-testing/unace-libre/PKGBUILD
index 8708694c6..fe5bac90f 100644
--- a/libre-testing/unace-libre/PKGBUILD
+++ b/libre-testing/unace-libre/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=unace
 pkgver=1.2b
 pkgrel=2
 pkgdesc="Extract, view and test ACE 1.x archives"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.emerge.de/"
 license=('GPL')
 depends=()
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
new file mode 100644
index 000000000..a9f003a90
--- /dev/null
+++ b/libre/abiword-libre/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 102234 2010-12-06 22:32:25Z ibiru $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Maël Lavault <moimael@neuf.fr>
+
+pkgbase=abiword-libre
+pkgname=('abiword-libre' 'abiword-libre-plugins')
+pkgver=2.8.6
+pkgrel=4
+arch=('i686' 'x86_64' 'mips64el')
+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' 'ttf-liberation')
+options=('!libtool')
+source=("http://repo.parabolagnulinux.org/other/${pkgbase}-${pkgver}.tar.gz"
+        liberation-fonts.patch
+        compat_libwpg_0_9.patch)
+conflicts=('abiword')
+replaces=('abiword')
+provides=("abiword=$pkgver")
+
+
+# source PKGBUILD; mksource
+mksource() {
+  #wget http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-${pkgver}.tar.gz -O -| \
+  #  tar xzf -
+
+  pushd abiword-${pkgver}
+  #find -type f -print0 | xargs -0 sed -i "s:Times New Roman:Liberation Serif:g"
+  patch -Np1 -i ../liberation-fonts.patch || return 1
+  popd
+
+  mv abiword-${pkgver} ${pkgbase}-${pkgver}
+  tar czf ${pkgbase}-${pkgver}.tar.gz ${pkgbase}-${pkgver}/
+
+  rm -r ${pkgbase}-${pkgver}/
+
+}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.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 
+
+
+  sed -ir 's/--no-undefined/-no-undefined/' src/Makefile
+  make
+}
+
+package_abiword-libre() {
+  pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
+  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant')
+  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-libre-plugins() {
+  pkgdesc="Additional plugins for Abiword"
+  depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf'
+           'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots')
+
+  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
+}
+md5sums=('d0f5d16d9259792fba0a3200c30ff6ae'
+         '6dcbf402f58d55cb4a9732348facd236'
+         '09446a2ebba8288fc611e88f7cf17298')
+md5sums=('d0f5d16d9259792fba0a3200c30ff6ae'
+         '880b17db6f249d977d2a7cd012d9ce02'
+         '09446a2ebba8288fc611e88f7cf17298')
diff --git a/extra/abiword/compat_libwpg_0_9.patch b/libre/abiword-libre/compat_libwpg_0_9.patch
index cf36e188e..cf36e188e 100644
--- a/extra/abiword/compat_libwpg_0_9.patch
+++ b/libre/abiword-libre/compat_libwpg_0_9.patch
diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword-libre/liberation-fonts.patch
new file mode 100644
index 000000000..a009b18f5
--- /dev/null
+++ b/libre/abiword-libre/liberation-fonts.patch
@@ -0,0 +1,1606 @@
+diff -auNpr abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp
+--- abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp	2009-07-20 16:22:04.000000000 -0300
++++ abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp	2011-07-02 15:37:16.397564815 -0300
+@@ -1062,7 +1062,7 @@ void s_LaTeX_Listener::_openSpan(PT_Attr
+ 				m_pie->write("\\texttt{");
+ 				m_NumCloseBrackets++;
+ 			}
+-			if (!strcmp("Arial", szValue) ||
++			if (!strcmp("Liberation Sans", szValue) ||
+ 				!strcmp("Helvetic", szValue) ||
+ 				!strcmp("Luxi Sans",szValue)) {
+ 				m_pie->write("\\textsf{");
+diff -auNpr abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp
+--- abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp	2008-04-20 11:44:51.000000000 -0300
++++ abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp	2011-07-02 15:37:12.791762814 -0300
+@@ -59,7 +59,7 @@ void ODi_FontFaceDecls::startElement (co
+         fontFamily = pFontFamily;
+ 
+         if (pFontFamily && (pFontFamily[0] == '\'') && (pFontFamily[strlen(pFontFamily)-1] == '\'')) {
+-            // e.g.:  Turns a "'Times New Roman'" into a "Times New Roman".
++            // e.g.:  Turns a "'Liberation Serif'" into a "Liberation Serif".
+             // OpenOffice.org sometimes adds those extra "'" surrounding the
+             // font family name if it's composed by more than one word.
+             m_fontFamilies[pStyleName] =
+diff -auNpr abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp
+--- abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp	2009-06-25 18:29:32.000000000 -0300
++++ abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp	2011-07-02 15:37:16.561646815 -0300
+@@ -899,12 +899,12 @@ bool OO_StylesWriter::writeStyles(PD_Doc
+     {	   
+       "<office:styles>\n",
+       "<style:default-style style:family=\"graphics\">\n",
+-      "<style:properties draw:start-line-spacing-horizontal=\"0.283cm\" draw:start-line-spacing-vertical=\"0.283cm\" draw:end-line-spacing-horizontal=\"0.283cm\" draw:end-line-spacing-vertical=\"0.283cm\" fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Arial Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"simple\" style:line-break=\"strict\">\n",
++      "<style:properties draw:start-line-spacing-horizontal=\"0.283cm\" draw:start-line-spacing-vertical=\"0.283cm\" draw:end-line-spacing-horizontal=\"0.283cm\" draw:end-line-spacing-vertical=\"0.283cm\" fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Liberation Sans\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"simple\" style:line-break=\"strict\">\n",
+       "<style:tab-stops/>\n",
+       "</style:properties>\n",
+       "</style:default-style>\n",
+       "<style:default-style style:family=\"paragraph\">\n",
+-      "<style:properties fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Arial Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" fo:hyphenate=\"false\" fo:hyphenation-remain-char-count=\"2\" fo:hyphenation-push-char-count=\"2\" fo:hyphenation-ladder-count=\"no-limit\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"hanging\" style:line-break=\"strict\" style:tab-stop-distance=\"2.205cm\"/>\n",
++      "<style:properties fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Liberation Sans\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" fo:hyphenate=\"false\" fo:hyphenation-remain-char-count=\"2\" fo:hyphenation-push-char-count=\"2\" fo:hyphenation-ladder-count=\"no-limit\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"hanging\" style:line-break=\"strict\" style:tab-stop-distance=\"2.205cm\"/>\n",
+       "</style:default-style>\n"
+     };
+   
+diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp
+--- abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp	2008-01-16 15:02:48.000000000 -0200
++++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp	2011-07-02 15:37:13.944338815 -0300
+@@ -34,7 +34,7 @@
+ #include <string>
+ 
+ OXML_FontManager::OXML_FontManager() : 
+-	m_defaultFont("Times New Roman")
++	m_defaultFont("Liberation Serif")
+ {
+ 	m_major_rts.clear();
+ 	m_minor_rts.clear();
+diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp
+--- abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp	2009-07-02 12:20:55.000000000 -0300
++++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp	2011-07-02 15:37:13.960346815 -0300
+@@ -258,7 +258,7 @@ UT_Error OXML_List::serialize(IE_Exp_Ope
+ 			txt = txt.replace(index+1, 1, 1, '1'+i);
+ 		}
+ 	
+-		std::string fontFamily("Times New Roman");
++		std::string fontFamily("Liberation Serif");
+ 		const gchar* listType = "bullet";
+ 		switch(type)
+ 		{
+diff -auNpr abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp
+--- abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp	2009-05-07 18:45:16.000000000 -0300
++++ abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp	2011-07-02 15:37:14.172452815 -0300
+@@ -318,7 +318,7 @@ void Passepartout_Listener::_openBlock(P
+                  }
+ 		else
+                  {
+-                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" );
++                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" );
+                    m_pie->write(TempStr.utf8_str());
+                  }
+ 
+@@ -426,7 +426,7 @@ void Passepartout_Listener::_openFont(PT
+                  }
+ 		else
+                  {
+-                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" );
++                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" );
+                    m_pie->write(TempStr.utf8_str());
+                  }
+ 
+diff -auNpr abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp
+--- abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp	2009-01-04 18:34:28.000000000 -0200
++++ abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp	2011-07-02 15:37:14.676704815 -0300
+@@ -620,7 +620,7 @@ switch (c)
+      case 0x01:
+ 	m_sfont ^=1;
+ 	if (m_sfont & 1)
+-	  { m_size=static_cast<int>(0.8*m_basesize); m_family="Arial"; 
++	  { m_size=static_cast<int>(0.8*m_basesize); m_family="Liberation Sans"; 
+ 		  /* FIXME? -> .profile?*/ }
+ 	else
+ 	  { m_size=m_basesize; m_family=m_basefamily; }
+diff -auNpr abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+--- abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp	2009-09-04 09:40:10.000000000 -0300
++++ abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp	2011-07-02 15:36:53.578160816 -0300
+@@ -182,7 +182,7 @@ GR_Font * GR_UnixCairoGraphics::getGUIFo
+ 		GtkStyle *tempStyle = gtk_style_new();
+ 		const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc);
+ 		if (!guiFontName)
+-			guiFontName = "'Times New Roman'";
++			guiFontName = "'Liberation Serif'";
+ 
+ 		UT_UTF8String s = XAP_EncodingManager::get_instance()->getLanguageISOName();
+ 
+diff -auNpr abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp
+--- abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp	2010-04-14 18:13:41.000000000 -0300
++++ abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp	2011-07-02 15:36:53.918330816 -0300
+@@ -756,8 +756,8 @@ bool GR_CairoGraphics::shape(GR_ShapingI
+ 
+ 	/*
+ 	 * Pango does a royally bad job of the font substitution in
+-	 * pango_itemize(): it will happily return 'Times New Roman' as
+-	 * font when we have requested 'Arial', even though the latter is
++	 * pango_itemize(): it will happily return 'Liberation Serif' as
++	 * font when we have requested 'Liberation Sans', even though the latter is
+ 	 * present and has the necessary coverage. Consequently we have to
+ 	 * do the font substitution manually even on the first shapping.
+ 	 *
+@@ -2931,7 +2931,7 @@ GR_Font * GR_CairoGraphics::getDefaultFo
+ 
+ 		case GR_Font::FF_Technical:
+ 		case GR_Font::FF_BiDi:
+-			pszFontFamily = "Arial";
++			pszFontFamily = "Liberation Sans";
+ 			break;
+ 			
+ 		default:
+diff -auNpr abiword-2.8.6/src/af/util/xp/ut_misc.cpp abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp
+--- abiword-2.8.6/src/af/util/xp/ut_misc.cpp	2009-06-28 19:09:08.000000000 -0300
++++ abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp	2011-07-02 15:36:54.746744816 -0300
+@@ -606,7 +606,7 @@ const gchar ** UT_setPropsToValue(const
+ }
+ 
+ /*!
+-   splits the xml property string (font-size:24pt;font-face:Arial') into names and values
++   splits the xml property string (font-size:24pt;font-face:Liberation Sans') into names and values
+    and stores them in an array
+ 
+    the caller has to delete[] the array; the process is destructive to props
+diff -auNpr abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib
+--- abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib	2005-08-02 02:31:06.000000000 -0300
++++ abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib	2011-07-02 15:36:51.257000816 -0300
+@@ -10910,7 +10910,7 @@
+ 				<integer>624</integer>
+ 			</dict>
+ 		</dict>
+-		<string>Times New Roman</string>
++		<string>Liberation Serif</string>
+ 		<string>_popUpItemAction:</string>
+ 		<dict>
+ 			<key>$class</key>
+diff -auNpr abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp
+--- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp	2009-09-01 11:49:33.000000000 -0300
++++ abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp	2011-07-02 15:36:50.404574816 -0300
+@@ -878,7 +878,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::prev
+ 
+ 	const gchar * file_name = gtk_file_chooser_get_uri (m_FC);
+ 	
+-	GR_Font * fnt = pGr->findFont("Times New Roman",
++	GR_Font * fnt = pGr->findFont("Liberation Serif",
+ 								  "normal", "", "normal",
+ 								  "", "12pt",
+ 								  pSS->getLanguageName());
+diff -auNpr abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp
+--- abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp	2009-07-08 05:17:51.000000000 -0300
++++ abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp	2011-07-02 15:36:50.788766816 -0300
+@@ -258,7 +258,7 @@ void XAP_Win32Dialog_About::runModal(XAP
+ 	lf.lfWeight = 0;
+ 	HFONT hfontSmall = CreateFontIndirect(&lf);
+ 
+-	strcpy(lf.lfFaceName, "Arial");
++	strcpy(lf.lfFaceName, "Liberation Sans");
+ 	lf.lfHeight = 36;
+ 	lf.lfWeight = FW_BOLD; 
+ 	HFONT hfontHeading = CreateFontIndirect(&lf);
+diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp
+--- abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp	2009-05-30 11:03:24.000000000 -0300
++++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp	2011-07-02 15:36:52.893818816 -0300
+@@ -569,7 +569,7 @@ void XAP_Preview_FontPreview::draw(void)
+ 	std::string sWeight = getVal("font-weight");
+ 
+ 	if(sFamily.empty())
+-		sFamily = "Times New Roman";
++		sFamily = "Liberation Serif";
+ 
+ 	if(sStyle.empty())
+ 		sStyle = "normal";
+diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp
+--- abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp	2007-01-16 20:17:27.000000000 -0300
++++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp	2011-07-02 15:36:52.681712816 -0300
+@@ -124,7 +124,7 @@ void XAP_Dialog_Zoom::_createPreviewFrom
+ 	UT_ASSERT(m_zoomPreview);
+ 	
+ 	m_zoomPreview->setWindowSize(width, height);
+-	m_zoomPreview->setString("10-pt Times New Roman");
++	m_zoomPreview->setString("10-pt Liberation Serif");
+ 	m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL);
+ 	m_zoomPreview->setZoomPercent(m_zoomPercent);
+ 
+diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp
+--- abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp	2009-10-29 14:47:05.000000000 -0300
++++ abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp	2011-07-02 15:36:52.753748816 -0300
+@@ -63,7 +63,7 @@ void XAP_Preview_Zoom::setFont(XAP_Previ
+ 	{
+ 	case XAP_Preview_Zoom::font_NORMAL:
+ 		sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100));
+-		found = m_gc->findFont("Times New Roman",
++		found = m_gc->findFont("Liberation Serif",
+ 							   "normal", "", "normal",
+ 							   "", fontString,
+ 							   NULL);
+diff -auNpr abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp
+--- abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp	2010-06-13 11:02:39.000000000 -0300
++++ abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp	2011-07-02 15:37:06.980858815 -0300
+@@ -9733,7 +9733,7 @@ void	fl_BlockLayout::StartList( const gc
+ 		{
+ 			FL_ListType lType = getListTypeFromStyle(szListStyle);
+ 			if(IS_NUMBERED_LIST_TYPE(lType))
+-				szFont = "Times New Roman";
++				szFont = "Liberation Serif";
+ 			else
+ 				szFont = "symbol";
+ 			UT_ASSERT(0);
+diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp
+--- abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp	2009-09-09 03:20:32.000000000 -0300
++++ abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp	2011-07-02 15:37:07.265000815 -0300
+@@ -1273,7 +1273,7 @@ void fp_Line::_doClearScreenFromRunToEnd
+ 		pRun = m_vecRuns.getNthItem(_getRunLogIndx(runIndex));
+ 
+ 		// Handle case where character extends behind the left side
+-		// like italic Times New Roman f. Clear a litle bit before if
++		// like italic Liberation Serif f. Clear a litle bit before if
+ 		// there is clear screen there
+ 		UT_sint32 j = runIndex - 1;
+ 
+diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp
+--- abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp	2010-04-14 18:49:37.000000000 -0300
++++ abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp	2011-07-02 15:37:08.021378815 -0300
+@@ -1434,7 +1434,7 @@ void fp_TextRun::_clearScreen(bool /* bF
+ 	
+ 	//
+ 	// Handle case where character extend behind the left side
+-	// like italic Times New Roman f
++	// like italic Liberation Serif f
+ 	//
+ 	fp_Line * thisLine = getLine();
+ 	fp_Run * pPrev = getPrevRun();
+diff -auNpr abiword-2.8.6/src/text/fmt/xp/fv_View.cpp abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp
+--- abiword-2.8.6/src/text/fmt/xp/fv_View.cpp	2010-06-13 11:02:39.000000000 -0300
++++ abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp	2011-07-02 15:37:08.353544815 -0300
+@@ -519,9 +519,9 @@ FV_View::FV_View(XAP_App * pApp, void* p
+ 		s += pCountry;
+ 	}
+ 		
+-	// do a fuzzy match for Times New Roman
++	// do a fuzzy match for Liberation Serif
+ 	const char * pszFamily =
+-		GR_Graphics::findNearestFont ("Times New Roman",
++		GR_Graphics::findNearestFont ("Liberation Serif",
+ 									  "normal", "normal",
+ 									  "normal", "normal",
+ 									  "12pt", s.utf8_str());
+diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp
+--- abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp	2009-05-18 23:33:18.000000000 -0300
++++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp	2011-07-02 15:37:09.053894814 -0300
+@@ -99,7 +99,7 @@ static PP_Property _props[] =
+ 
+ 	{ "field-color",           "dcdcdc",          true,  NULL, PP_LEVEL_FIELD},
+ 	{ "field-font",	           "NULL",	          true,  NULL, PP_LEVEL_FIELD},
+-	{ "font-family",           "Times New Roman", true,  NULL, PP_LEVEL_CHAR},
++	{ "font-family",           "Liberation Serif", true,  NULL, PP_LEVEL_CHAR},
+ 	{ "font-size",	           "12pt",	          true,  NULL, PP_LEVEL_CHAR},	// MS word defaults to 10pt, but it just seems too small
+ 	{ "font-stretch",          "normal",          true,  NULL, PP_LEVEL_CHAR},
+ 	{ "font-style",	           "normal",          true,  NULL, PP_LEVEL_CHAR},
+diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp
+--- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp	2009-05-07 23:35:14.000000000 -0300
++++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp	2011-07-02 15:37:08.881808814 -0300
+@@ -350,7 +350,7 @@ void PP_RevisionAttr::_init(const gchar
+ 		return;
+ 
+ 	// the string we are parsing looks like
+-	// "+1,-2,!3{font-family: Times New Roman}"
++	// "+1,-2,!3{font-family: Liberation Serif}"
+ 
+ 	// first duplicate the string so we can play with it ...
+ 	char * s = (char*) g_strdup(r);
+diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h
+--- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h	2009-01-04 20:32:46.000000000 -0200
++++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h	2011-07-02 15:37:09.530132814 -0300
+@@ -101,7 +101,7 @@ class ABI_EXPORT PP_Revision: public PP_
+       where n is a numerical id of the revision and props is regular
+       property string, for instance
+ 
+-          font-family:Times New Roman
++          font-family:Liberation Serif
+ 
+       revoval of property/attribute is indicated by setting to -/-, e.g.,
+ 
+diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp
+--- abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp	2009-01-04 18:34:28.000000000 -0200
++++ abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp	2011-07-02 15:37:09.101918814 -0300
+@@ -155,7 +155,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
+ 		s += pCountry;
+ 	}
+ 	
+-	const char* pszFamily = XAP_App::findNearestFont("Times New Roman",
++	const char* pszFamily = XAP_App::findNearestFont("Liberation Serif",
+ 													 "normal", "",
+ 													 "normal", "", "12pt",
+ 													 s.utf8_str());
+@@ -167,7 +167,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
+ 					  "text-indent:0in; text-position:normal; line-height:1.0; "
+ 					  "color:000000; bgcolor:transparent; widows:2", pszFamily);
+ 
+-	pszFamily = XAP_App::findNearestFont("Arial", "normal", "",
++	pszFamily = XAP_App::findNearestFont("Liberation Sans", "normal", "",
+ 										 "normal", "", "12pt", s.utf8_str());
+ 
+ 	// used to set the dom-dir of the style here, but we do not want to do that. The
+@@ -239,7 +239,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
+ 	UT_String_sprintf(stTmp, list_fmt, "Heart List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
+ 	_s("Heart List",false, "P", "", "Current Settings", stTmp.c_str());
+ 
+-	// pszFamily is the nearest font to Arial found in the system
++	// pszFamily is the nearest font to Liberation Sans found in the system
+ 	UT_String_sprintf(stTmp, "tabstops:0.3in/L0; list-style:Numbered List; "
+ 					  "start-value:1; margin-left:0.0in; text-indent:0.0in; "
+ 					  "field-color:transparent; list-delim:%%L.; field-font:%s; "
+@@ -250,7 +250,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
+     _s("Numbered Heading 2",true,"P","Heading 2","Normal", stTmp.c_str());
+     _s("Numbered Heading 3",true,"P","Heading 3","Normal", stTmp.c_str());
+ 
+-	// pszFamily is the nearest font to Arial found in the system
++	// pszFamily is the nearest font to Liberation Sans found in the system
+ 
+ 	UT_String_sprintf(stTmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", ".");
+ 
+diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp
+--- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp	2009-05-20 18:22:35.000000000 -0300
++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp	2011-07-02 15:37:01.798268815 -0300
+@@ -1170,7 +1170,7 @@ void AP_Lists_preview::setData(const gch
+ 	//
+ 	if(!pszFont || strcmp(pszFont,"NULL")== 0)
+ 	{
+-		m_pFont = m_gc->findFont("Times New Roman",
++		m_pFont = m_gc->findFont("Liberation Serif",
+ 								 "normal", "", "normal",
+ 								 "", "16pt", NULL);
+ 	}
+diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp
+--- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp	2007-05-08 14:16:33.000000000 -0300
++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp	2011-07-02 15:37:02.462600815 -0300
+@@ -88,7 +88,7 @@ AP_Preview_PageNumbers::AP_Preview_PageN
+ 	char fontString [10];
+ 	sprintf(fontString, "%dpt", 8);
+ 	
+-	GR_Font * found =  m_gc->findFont("Times New Roman", "normal",
++	GR_Font * found =  m_gc->findFont("Liberation Serif", "normal",
+ 									  "", "normal", "", fontString,
+ 									  NULL);
+ 	
+diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp
+--- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp	2009-09-29 10:58:11.000000000 -0300
++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp	2011-07-02 15:37:03.311024815 -0300
+@@ -94,7 +94,7 @@ void AP_Preview_Annotation::setSizeFromA
+ 	pG = pView->getGraphics();
+ 
+ 	UT_return_if_fail(pG);
+-	GR_Font * pFont = pG->findFont("Times New Roman", "normal",
++	GR_Font * pFont = pG->findFont("Liberation Serif", "normal",
+ 				       "normal", "normal",
+ 				       "normal", "12pt",
+ 				       NULL);
+@@ -122,7 +122,7 @@ void AP_Preview_Annotation::draw(void)
+ 	UT_RGBColor FGcolor(0,0,0);
+ 	UT_RGBColor BGcolor(m_clrBackground);
+ 	
+-	m_pFont = m_gc->findFont("Times New Roman", "normal",
++	m_pFont = m_gc->findFont("Liberation Serif", "normal",
+ 							 "normal", "normal",
+ 							 "normal", "12pt",
+ 							 NULL);
+diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp
+--- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2009-03-09 17:01:46.000000000 -0200
++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2011-07-02 15:37:03.527132815 -0300
+@@ -539,7 +539,7 @@ void AP_Preview_Paragraph::draw(void)
+ bool AP_Preview_Paragraph::_loadDrawFont(void)
+ {
+ 	// we draw at 7 points in this preview
+-	GR_Font * font = m_gc->findFont("Times New Roman",
++	GR_Font * font = m_gc->findFont("Liberation Serif",
+ 									"normal", "", "normal",
+ 									"", "7pt",
+ 									NULL); // might need to get the real lang
+diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp
+--- abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp	2009-09-29 17:00:48.000000000 -0300
++++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp	2011-07-02 15:37:03.939338815 -0300
+@@ -2829,7 +2829,7 @@ void IE_Exp_RTF::_output_ListRTF(fl_Auto
+ 	case DASHED_LIST:
+ 		Param = 23;
+ 		bulletsym = '-';
+-		fontName = "Times New Roman";
++		fontName = "Liberation Serif";
+ 		break;
+ 	case SQUARE_LIST:
+ 		Param = 23;
+diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp
+--- abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2009-09-23 02:22:43.000000000 -0300
++++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2011-07-02 15:37:03.883310815 -0300
+@@ -621,10 +621,10 @@ s_fieldFontForListStyle (MSWordListIdTyp
+ 	  return "NULL";
+ 
+ 	case WLNF_UPPER_LETTER: // upper letter
+-	  return "Times New Roman";
++	  return "Liberation Serif";
+ 
+ 	case WLNF_LOWER_LETTER: // lower letter
+-	  return "Times New Roman";
++	  return "Liberation Serif";
+ 
+ 	case WLNF_BULLETS: // bullet list
+ 		UT_DEBUGMSG(("Fieldfont set to symbol \n"));
+@@ -632,11 +632,11 @@ s_fieldFontForListStyle (MSWordListIdTyp
+ 
+ 	case WLNF_EUROPEAN_ARABIC:
+ 	case WLNF_ORDINAL: // ordinal
+-		return "Times New Roman";
++		return "Liberation Serif";
+ 		
+ 	default:
+-		UT_DEBUGMSG(("unknown list type %d field-font set to Times New Roman \n",id));
+-	  return "Times New Roman";
++		UT_DEBUGMSG(("unknown list type %d field-font set to Liberation Serif \n",id));
++	  return "Liberation Serif";
+ 	}
+ }
+ 
+@@ -5243,7 +5243,7 @@ void IE_Imp_MsWord_97::_generateCharProp
+ 	if(fname)
+ 		s += fname;
+ 	else
+-		s += "Times New Roman";
++		s += "Liberation Serif";
+ 	FREEP(fname);
+ }
+ 
+diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp
+--- abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp	2009-07-27 02:26:14.000000000 -0300
++++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp	2011-07-02 15:37:04.239488815 -0300
+@@ -5958,11 +5958,11 @@ bool IE_Imp_RTF::buildCharacterProps(UT_
+ 		// {\f83\fnil\fcharset0\fprq0{\*\panose 00000000000000000000} ;}
+ 		// note the empty slot after the panose entry
+ 		// later it gets referenced: {\b\f83\fs24\cf1\cgrid0 Malte Cornils
+-		// this turns those into "Times New Roman" for now, as a hack to keep from crashing
++		// this turns those into "Liberation Serif" for now, as a hack to keep from crashing
+ 		if ( pFont->m_pFontName != NULL )
+ 			propBuffer += pFont->m_pFontName;
+ 		else
+-			propBuffer += "Times New Roman";
++			propBuffer += "Liberation Serif";
+ 	}
+ 	if (m_currentRTFState.m_charProps.m_hasColour)
+ 	{
+@@ -8612,7 +8612,7 @@ bool IE_Imp_RTF::ReadFontTable()
+ 	{
+ 		// NB: Ignores whitespace until we've seen non-whitespace data.
+ 		//     This means we pick up the spaces in font names like
+-		//     "Times New Roman", but it also means that any font names
++		//     "Liberation Serif", but it also means that any font names
+ 		//     that genuinely start with spaces will have them discarded.
+ 		//     This is hopefully not a problem.
+ 		tokenType = NextToken(keyword, &parameter,& paramUsed,
+@@ -8680,11 +8680,11 @@ bool IE_Imp_RTF::ReadFontTable()
+ 				// It's possible that the font name will be empty. This might happend 
+ 				// because the font table didn't specify a name, or because the \ansicpgN
+ 				// command was invalid, in which case the mbtowc convertion might fail.
+-				// In these cases, substitute "Times New Roman".
++				// In these cases, substitute "Liberation Serif".
+ 				if (!sFontNamesAndPanose[SFontTableState::MainFontName].length())
+ 				{
+-					UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Times New Roman\" for missing font name.\n", fontIndex));
+-					sFontNamesAndPanose[SFontTableState::MainFontName] = "Times New Roman";
++					UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Liberation Serif\" for missing font name.\n", fontIndex));
++					sFontNamesAndPanose[SFontTableState::MainFontName] = "Liberation Serif";
+ 				}
+ 				// Validate and post-process the Panose string.
+ 				if (!PostProcessAndValidatePanose(sFontNamesAndPanose[SFontTableState::Panose])) 
+diff -auNpr abiword-2.8.6/user/wp/readme.abw abiword-libre-2.8.6/user/wp/readme.abw
+--- abiword-2.8.6/user/wp/readme.abw	2009-07-23 16:50:13.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/readme.abw	2011-07-02 15:37:19.891310814 -0300
+@@ -16,9 +16,9 @@
+ <version id="9" started="1131226323" uid="e94517c8-4e44-11da-9bf9-8faddbe5f409" auto="0" top-xid="120"/>
+ </history>
+ <styles>
+-<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:17pt; lang:-none-"/>
+-<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0pt; lang:-none-; dom-dir:ltr; font-variant:normal; text-indent:0in; margin-bottom:12pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s type="P" name="Heading 2" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:14pt; lang:-none-"/>
++<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:17pt; lang:-none-"/>
++<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0pt; lang:-none-; dom-dir:ltr; font-variant:normal; text-indent:0in; margin-bottom:12pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s type="P" name="Heading 2" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:14pt; lang:-none-"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section xid="1">
+diff -auNpr abiword-2.8.6/user/wp/templates/Business-Letter.awt abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt
+--- abiword-2.8.6/user/wp/templates/Business-Letter.awt	2009-05-22 07:15:16.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt	2011-07-02 15:37:19.995362813 -0300
+@@ -19,14 +19,14 @@
+ <version id="4" started="1097285263" uid="6ad98dfc-1992-11d9-90cf-d572573794e2" auto="0"/>
+ </history>
+ <styles>
+-<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Times New Roman"/>
+-<s followedby="Letter Body" name="Inside Address" basedon="Block Text" type="P" props="text-indent:0in; orphans:2; margin-top:0pt; margin-left:0.0000in; list-decimal:.; line-height:1.0; keep-with-next:no; text-align:left; list-style:None; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; start-value:1; font-variant:normal; color:000000; font-stretch:normal; keep-together:no; font-size:12pt; margin-right:0.0000in; font-style:normal; widows:2; list-delim:%L; font-family:Times New Roman"/>
++<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Liberation Serif"/>
++<s followedby="Letter Body" name="Inside Address" basedon="Block Text" type="P" props="text-indent:0in; orphans:2; margin-top:0pt; margin-left:0.0000in; list-decimal:.; line-height:1.0; keep-with-next:no; text-align:left; list-style:None; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; start-value:1; font-variant:normal; color:000000; font-stretch:normal; keep-together:no; font-size:12pt; margin-right:0.0000in; font-style:normal; widows:2; list-delim:%L; font-family:Liberation Serif"/>
+ <s type="P" name="Block Text" basedon="Normal" followedby="Current Settings" props="margin-bottom:6pt; margin-right:1in; margin-left:1in"/>
+-<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; bgcolor:transparent; text-decoration:none; text-indent:0.0000in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-family:Times New Roman; margin-top:12pt; font-variant:normal; margin-left:0pt; text-align:left; font-style:normal; text-indent:0in; color:000000; line-height:1.0; widows:2; bgcolor:transparent; margin-right:0pt; text-decoration:none; font-size:12pt; font-weight:normal; margin-bottom:0pt; lang:en-US; font-stretch:normal"/>
+-<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:48pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Block Text" name="Signature Line" basedon="Return Address Section" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; bgcolor:transparent; text-decoration:none; text-indent:0.0000in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-family:Liberation Serif; margin-top:12pt; font-variant:normal; margin-left:0pt; text-align:left; font-style:normal; text-indent:0in; color:000000; line-height:1.0; widows:2; bgcolor:transparent; margin-right:0pt; text-decoration:none; font-size:12pt; font-weight:normal; margin-bottom:0pt; lang:en-US; font-stretch:normal"/>
++<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:48pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Block Text" name="Signature Line" basedon="Return Address Section" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+ <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
+diff -auNpr abiword-2.8.6/user/wp/templates/Business-Report.awt abiword-libre-2.8.6/user/wp/templates/Business-Report.awt
+--- abiword-2.8.6/user/wp/templates/Business-Report.awt	2009-05-22 07:15:18.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Business-Report.awt	2011-07-02 15:37:20.011370813 -0300
+@@ -21,7 +21,7 @@
+ <p style="Normal" props="text-align:right"><c props="lang:en-US; font-size:12 pt"></c></p>
+ <p style="Normal" props="text-align:right"><c props="lang:en-US; font-size:12 pt"></c></p>
+ <p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:48 pt; font-weight:bold">Title</c><c props="lang:en-US; font-size:48 pt; font-weight:bold"></c></p>
+-<p style="Normal" props="text-align:left"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt">Subtitle</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt"></c></p>
++<p style="Normal" props="text-align:left"><c props="font-family:Liberation Serif; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt">Subtitle</c><c props="font-family:Liberation Serif; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt"></c></p>
+ <p style="Normal" props="text-align:right; margin-top:0pt; line-height:1.0"><c props="lang:en-US; font-size:8 pt"></c><image dataid="/home/dickk/images/balk.png_0" props="lang:en-US; height:0.090551in; width:6.295276in"/></p>
+ <p style="Normal" props="text-align:right; margin-top:0pt; line-height:1.0"><c props="lang:en-US; font-size:18 pt; font-weight:bold">Release 1.0</c></p>
+ <p style="Normal"><c props="lang:en-US"></c></p>
+@@ -99,11 +99,11 @@
+ <section footer="1961180032" header="671410933">
+ <p style="Normal"></p>
+ <p style="Normal"></p>
+-<p level="1" listid="1908846824" parentid="0" style="Numbered Heading 1" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c props="list-tag:254800672"><pbr/></c><c props="list-tag:254800672"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt">	Heading 1</c></p>
++<p level="1" listid="1908846824" parentid="0" style="Numbered Heading 1" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c props="list-tag:254800672"><pbr/></c><c props="list-tag:254800672"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt">	Heading 1</c></p>
+ <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in">text</c><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
+-<p level="2" listid="686698307" parentid="1908846824" style="Numbered Heading 2" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1877104478"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt">	Heading 2</c></p>
++<p level="2" listid="686698307" parentid="1908846824" style="Numbered Heading 2" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1877104478"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt">	Heading 2</c></p>
+ <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in">text</c><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
+-<p level="3" listid="1990149216" parentid="686698307" style="Numbered Heading 3" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1324672020"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt">	Heading 3</c></p>
++<p level="3" listid="1990149216" parentid="686698307" style="Numbered Heading 3" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1324672020"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt">	Heading 3</c></p>
+ <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
+ </section>
+ <section id="1961180032" listid="0" parentid="0" type="footer">
+diff -auNpr abiword-2.8.6/user/wp/templates/Employee-Directory.awt abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt
+--- abiword-2.8.6/user/wp/templates/Employee-Directory.awt	2009-05-22 07:15:21.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt	2011-07-02 15:37:20.047388813 -0300
+@@ -10,9 +10,9 @@
+ 
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+ <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
+-<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:20pt; font-family:Times New Roman">Company Name</c></p>
+-<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:26pt; font-family:Times New Roman">Directory of Employees</c></p>
+-<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:12pt; font-family:Times New Roman"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; font-size:12pt; width:8.23in"/></p>
++<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:20pt; font-family:Liberation Serif">Company Name</c></p>
++<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:26pt; font-family:Liberation Serif">Directory of Employees</c></p>
++<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:12pt; font-family:Liberation Serif"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; font-size:12pt; width:8.23in"/></p>
+ <p style="Normal" props="text-align:center"><c props="lang:en-US; font-size:12pt"></c></p>
+ <p style="Normal" props="text-align:center"><c props="lang:en-US; font-size:12pt"></c></p>
+ <p style="Normal" props="text-align:center"><c props="lang:en-US"></c></p>
+@@ -36,59 +36,59 @@
+ <p style="Normal" props="tabstops:2.0000in/L0"><c type="date">Normal Style	(123) 555-1212</c></p>
+ <p style="Normal" props="text-align:left; tabstops:2.0000in/L0"><c type="date" props="font-weight:normal; font-size:11pt; font-style:normal"></c></p>
+ <p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-weight:normal; font-size:11pt; font-style:normal"></c></p>
+-<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
+-<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; text-decoration:underline ">General Numbers</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Front Desk	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Security	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Building Management	(123) 555-1212</c></p>
+-<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Other General Numbers	(123) 555-1212</c></p>
++<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
++<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; text-decoration:underline ">General Numbers</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Front Desk	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Security	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Building Management	(123) 555-1212</c></p>
++<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Other General Numbers	(123) 555-1212</c></p>
+ </section>
+ <data>
+ <d name="C:\Documents and Settings\jgz\Desktop\bookopen.bmp_0" mime-type="image/png" base64="yes">
+diff -auNpr abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt
+--- abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt	2009-05-22 07:15:24.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt	2011-07-02 15:37:20.027378813 -0300
+@@ -10,26 +10,26 @@
+ 
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+ <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
+-<p style="Normal" props="tabstops:6.2500in/R0,2.7500in/L0,4.5000in/C0"><c props="lang:en-US">	</c><c props="bgcolor:000000; lang:en-US; font-size:24pt; font-family:Arial Black; color:ffffff">	Company Name	</c><c props="bgcolor:000000; lang:en-US; font-size:12pt; font-family:Arial Black; color:ffffff"></c></p>
+-<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 1</c></p>
+-<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 2</c></p>
+-<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 3</c></p>
+-<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000"></c></p>
+-<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:72pt; font-family:Arial Black; color:000000">FAX</c></p>
+-<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">TO:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">From:	</c></p>
+-<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Fax:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Pages:	</c></p>
+-<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_1" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Phone:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Date:	</c><field type="date_mdy" param=""></field></p>
++<p style="Normal" props="tabstops:6.2500in/R0,2.7500in/L0,4.5000in/C0"><c props="lang:en-US">	</c><c props="bgcolor:000000; lang:en-US; font-size:24pt; font-family:Liberation Sans Bold; color:ffffff">	Company Name	</c><c props="bgcolor:000000; lang:en-US; font-size:12pt; font-family:Liberation Sans Bold; color:ffffff"></c></p>
++<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 1</c></p>
++<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 2</c></p>
++<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 3</c></p>
++<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000"></c></p>
++<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:72pt; font-family:Liberation Sans Bold; color:000000">FAX</c></p>
++<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">TO:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">From:	</c></p>
++<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Fax:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Pages:	</c></p>
++<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_1" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Phone:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Date:	</c><field type="date_mdy" param=""></field></p>
+ <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_2" props="height:0.15in; width:8.23in"/></p>
+ <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-weight:bold">Re:	</c><c type="date_mdy" param="">	</c><c type="date_mdy" param="" props="font-weight:bold">CC:		</c></p>
+ <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-weight:bold"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_4" props="height:0.15in; width:8.23in"/></p>
+ <p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"></p>
+-<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Urgent	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">For Review	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Comment	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Reply	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Recycle</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">	</c></p>
+-<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_5" props="height:0.15in; width:8.23in"/></p>
++<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Urgent	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">For Review	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Comment	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Reply	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Recycle</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">	</c></p>
++<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_5" props="height:0.15in; width:8.23in"/></p>
+ <p style="Normal"></p>
+ <p style="Normal"></p>
+-<p style="Normal" props="text-align:center"><c props="font-family:Arial; text-decoration:underline; color:000000; lang:en-US; bgcolor:ffffff; font-weight:bold; font-size:16pt">Comments</c></p>
++<p style="Normal" props="text-align:center"><c props="font-family:Liberation Sans; text-decoration:underline; color:000000; lang:en-US; bgcolor:ffffff; font-weight:bold; font-size:16pt">Comments</c></p>
+ <p style="Normal" props="margin-left:0.0000in"></p>
+-<p style="Normal" props="margin-left:0.0000in"><c props="font-family:Arial; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none">This text should the replaced with your comments about the fax and any </c><c props="font-family:Arial; bgcolor:ffffff; font-size:10pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">additional</c><c props="font-family:Arial; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none"> comment to the receiver. </c></p>
++<p style="Normal" props="margin-left:0.0000in"><c props="font-family:Liberation Sans; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none">This text should the replaced with your comments about the fax and any </c><c props="font-family:Liberation Sans; bgcolor:ffffff; font-size:10pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">additional</c><c props="font-family:Liberation Sans; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none"> comment to the receiver. </c></p>
+ </section>
+ <data>
+ <d name="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" mime-type="image/png" base64="yes">
+diff -auNpr abiword-2.8.6/user/wp/templates/Friendly-Letter.awt abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt
+--- abiword-2.8.6/user/wp/templates/Friendly-Letter.awt	2009-05-22 07:15:27.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt	2011-07-02 15:37:20.023376813 -0300
+@@ -16,12 +16,12 @@
+ <version id="1" started="1096736888" uid="a22a447e-1495-11d9-9525-9e1170ef822d" auto="0"/>
+ </history>
+ <styles>
+-<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; text-decoration:none; font-weight:normal; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Times New Roman"/>
+-<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0.5000in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:48pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s type="P" name="Signature Line" basedon="Return Address Section" followedby="Block Text" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; text-decoration:none; font-weight:normal; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Liberation Serif"/>
++<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0.5000in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:48pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s type="P" name="Signature Line" basedon="Return Address Section" followedby="Block Text" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+ <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
+diff -auNpr abiword-2.8.6/user/wp/templates/Memo.awt abiword-libre-2.8.6/user/wp/templates/Memo.awt
+--- abiword-2.8.6/user/wp/templates/Memo.awt	2009-05-22 07:15:31.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Memo.awt	2011-07-02 15:37:19.915322814 -0300
+@@ -14,10 +14,10 @@
+ <m key="abiword.date_last_changed">Fri Mar 12 21:07:56 2004</m>
+ </metadata>
+ <styles>
+-<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:10pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:10pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:normal; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:10pt"/>
+-<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:10pt; margin-bottom:3pt; text-align:right; font-style:italic; font-weight:normal; font-family:Arial; keep-with-next:1"/>
+-<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:17pt"/>
++<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:10pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:10pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:normal; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:10pt"/>
++<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:10pt; margin-bottom:3pt; text-align:right; font-style:italic; font-weight:normal; font-family:Liberation Sans; keep-with-next:1"/>
++<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:17pt"/>
+ </styles>
+ <lists>
+ <l id="1002" parentid="0" type="5" start-value="0" list-delim="%L" list-decimal="NULL"/>
+@@ -59,10 +59,10 @@
+ <p style="Normal">The box that this text is in uses AbiWord's table support to draw the border.  You can either allow the border to fit to the size of the text as it is now, or press &lt;ENTER&gt; repeatedly at the end of your memo to expand the border to fill the rest of the page.</p>
+ <p style="Normal">Don't forget to change the header and footer before printing!  If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.</p>
+ <p style="Normal">The styles used in this document for correct conversion, import, export, and HTML are:</p>
+-<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="list-tag:1003"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 1 for Company Name</c></p>
+-<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1004; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 2 for Slogan</c></p>
+-<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1005; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 3 for "Date:", "To:", etc.</c></p>
+-<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1006; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Normal for body text</c></p>
++<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="list-tag:1003"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 1 for Company Name</c></p>
++<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1004; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 2 for Slogan</c></p>
++<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1005; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 3 for "Date:", "To:", etc.</c></p>
++<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1006; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Normal for body text</c></p>
+ </cell>
+ </table>
+ <p style="Normal"></p>
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt abiword-libre-2.8.6/user/wp/templates/normal.awt
+--- abiword-2.8.6/user/wp/templates/normal.awt	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt	2011-07-02 15:37:20.019374813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ 
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-am_ET abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET
+--- abiword-2.8.6/user/wp/templates/normal.awt-am_ET	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET	2011-07-02 15:37:20.015372813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar abiword-libre-2.8.6/user/wp/templates/normal.awt-ar
+--- abiword-2.8.6/user/wp/templates/normal.awt-ar	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar	2011-07-02 15:37:20.019374813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_EG abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG
+--- abiword-2.8.6/user/wp/templates/normal.awt-ar_EG	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG	2011-07-02 15:37:19.979354813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_SA abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA
+--- abiword-2.8.6/user/wp/templates/normal.awt-ar_SA	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA	2011-07-02 15:37:19.999364813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-bg_BG abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG
+--- abiword-2.8.6/user/wp/templates/normal.awt-bg_BG	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG	2011-07-02 15:37:19.975352813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ca_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES
+--- abiword-2.8.6/user/wp/templates/normal.awt-ca_ES	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES	2011-07-02 15:37:19.923326814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ
+--- abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ	2011-07-02 15:37:20.003366813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-da_DK abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK
+--- abiword-2.8.6/user/wp/templates/normal.awt-da_DK	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK	2011-07-02 15:37:19.995362813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de abiword-libre-2.8.6/user/wp/templates/normal.awt-de
+--- abiword-2.8.6/user/wp/templates/normal.awt-de	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de	2011-07-02 15:37:20.007368813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_AT abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT
+--- abiword-2.8.6/user/wp/templates/normal.awt-de_AT	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT	2011-07-02 15:37:19.975352813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH
+--- abiword-2.8.6/user/wp/templates/normal.awt-de_CH	2008-04-09 21:48:42.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH	2011-07-02 15:37:19.979354813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_DE abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE
+--- abiword-2.8.6/user/wp/templates/normal.awt-de_DE	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE	2011-07-02 15:37:20.035382813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-div_MV abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV
+--- abiword-2.8.6/user/wp/templates/normal.awt-div_MV	2007-01-14 12:52:46.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV	2011-07-02 15:37:20.071400813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-el_GR abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR
+--- abiword-2.8.6/user/wp/templates/normal.awt-el_GR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR	2011-07-02 15:37:20.063396813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_AU abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU
+--- abiword-2.8.6/user/wp/templates/normal.awt-en_AU	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU	2011-07-02 15:37:19.903316814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA
+--- abiword-2.8.6/user/wp/templates/normal.awt-en_CA	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA	2011-07-02 15:37:20.079404813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="216.000000" height="279.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_GB abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB
+--- abiword-2.8.6/user/wp/templates/normal.awt-en_GB	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB	2011-07-02 15:37:19.911320814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_IE abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE
+--- abiword-2.8.6/user/wp/templates/normal.awt-en_IE	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE	2011-07-02 15:37:20.075402813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_NZ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ
+--- abiword-2.8.6/user/wp/templates/normal.awt-en_NZ	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ	2011-07-02 15:37:20.067398813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_ZA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA
+--- abiword-2.8.6/user/wp/templates/normal.awt-en_ZA	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA	2011-07-02 15:37:20.079404813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es abiword-libre-2.8.6/user/wp/templates/normal.awt-es
+--- abiword-2.8.6/user/wp/templates/normal.awt-es	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es	2011-07-02 15:37:19.903316814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_AR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR
+--- abiword-2.8.6/user/wp/templates/normal.awt-es_AR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR	2011-07-02 15:37:20.039384813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES
+--- abiword-2.8.6/user/wp/templates/normal.awt-es_ES	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES	2011-07-02 15:37:20.063396813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR
+--- abiword-2.8.6/user/wp/templates/normal.awt-es_IR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR	2011-07-02 15:37:20.011370813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_MX abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX
+--- abiword-2.8.6/user/wp/templates/normal.awt-es_MX	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX	2011-07-02 15:37:19.919324814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fa_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR
+--- abiword-2.8.6/user/wp/templates/normal.awt-fa_IR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR	2011-07-02 15:37:20.003366813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fi_FI abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI
+--- abiword-2.8.6/user/wp/templates/normal.awt-fi_FI	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI	2011-07-02 15:37:19.999364813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr abiword-libre-2.8.6/user/wp/templates/normal.awt-fr
+--- abiword-2.8.6/user/wp/templates/normal.awt-fr	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr	2011-07-02 15:37:20.019374813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_BE abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE
+--- abiword-2.8.6/user/wp/templates/normal.awt-fr_BE	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE	2011-07-02 15:37:20.075402813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA
+--- abiword-2.8.6/user/wp/templates/normal.awt-fr_CA	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA	2011-07-02 15:37:19.907318814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH
+--- abiword-2.8.6/user/wp/templates/normal.awt-fr_CH	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH	2011-07-02 15:37:19.899314814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_FR abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR
+--- abiword-2.8.6/user/wp/templates/normal.awt-fr_FR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR	2011-07-02 15:37:19.983356813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-gl_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES
+--- abiword-2.8.6/user/wp/templates/normal.awt-gl_ES	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES	2011-07-02 15:37:20.023376813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he abiword-libre-2.8.6/user/wp/templates/normal.awt-he
+--- abiword-2.8.6/user/wp/templates/normal.awt-he	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he	2011-07-02 15:37:19.995362813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he_IL abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL
+--- abiword-2.8.6/user/wp/templates/normal.awt-he_IL	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL	2011-07-02 15:37:19.979354813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-hu_HU abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU
+--- abiword-2.8.6/user/wp/templates/normal.awt-hu_HU	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU	2011-07-02 15:37:19.979354813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-it_IT abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT
+--- abiword-2.8.6/user/wp/templates/normal.awt-it_IT	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT	2011-07-02 15:37:19.911320814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ja_JP abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP
+--- abiword-2.8.6/user/wp/templates/normal.awt-ja_JP	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP	2011-07-02 15:37:20.027378813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-lt_LT abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT
+--- abiword-2.8.6/user/wp/templates/normal.awt-lt_LT	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT	2011-07-02 15:37:19.899314814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nb_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO
+--- abiword-2.8.6/user/wp/templates/normal.awt-nb_NO	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO	2011-07-02 15:37:19.999364813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nl_NL abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL
+--- abiword-2.8.6/user/wp/templates/normal.awt-nl_NL	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL	2011-07-02 15:37:19.911320814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nn_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO
+--- abiword-2.8.6/user/wp/templates/normal.awt-nn_NO	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO	2011-07-02 15:37:20.031380813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pl_PL abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL
+--- abiword-2.8.6/user/wp/templates/normal.awt-pl_PL	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL	2011-07-02 15:37:20.011370813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ps abiword-libre-2.8.6/user/wp/templates/normal.awt-ps
+--- abiword-2.8.6/user/wp/templates/normal.awt-ps	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ps	2011-07-02 15:37:20.035382813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_BR abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR
+--- abiword-2.8.6/user/wp/templates/normal.awt-pt_BR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR	2011-07-02 15:37:19.915322814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_PT abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT
+--- abiword-2.8.6/user/wp/templates/normal.awt-pt_PT	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT	2011-07-02 15:37:20.035382813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru abiword-libre-2.8.6/user/wp/templates/normal.awt-ru
+--- abiword-2.8.6/user/wp/templates/normal.awt-ru	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru	2011-07-02 15:37:19.907318814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru_RU abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU
+--- abiword-2.8.6/user/wp/templates/normal.awt-ru_RU	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU	2011-07-02 15:37:19.919324814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sk_SK abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK
+--- abiword-2.8.6/user/wp/templates/normal.awt-sk_SK	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK	2011-07-02 15:37:20.075402813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sl abiword-libre-2.8.6/user/wp/templates/normal.awt-sl
+--- abiword-2.8.6/user/wp/templates/normal.awt-sl	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sl	2011-07-02 15:37:20.031380813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv abiword-libre-2.8.6/user/wp/templates/normal.awt-sv
+--- abiword-2.8.6/user/wp/templates/normal.awt-sv	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv	2011-07-02 15:37:20.015372813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv_SE abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE
+--- abiword-2.8.6/user/wp/templates/normal.awt-sv_SE	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE	2011-07-02 15:37:20.067398813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-syr abiword-libre-2.8.6/user/wp/templates/normal.awt-syr
+--- abiword-2.8.6/user/wp/templates/normal.awt-syr	2007-01-14 12:52:46.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-syr	2011-07-02 15:37:20.079404813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr abiword-libre-2.8.6/user/wp/templates/normal.awt-tr
+--- abiword-2.8.6/user/wp/templates/normal.awt-tr	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr	2011-07-02 15:37:19.903316814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr_TR abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR
+--- abiword-2.8.6/user/wp/templates/normal.awt-tr_TR	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR	2011-07-02 15:37:19.911320814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-uk_UA abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA
+--- abiword-2.8.6/user/wp/templates/normal.awt-uk_UA	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA	2011-07-02 15:37:20.003366813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ur_PK abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK
+--- abiword-2.8.6/user/wp/templates/normal.awt-ur_PK	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK	2011-07-02 15:37:20.067398813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-yi abiword-libre-2.8.6/user/wp/templates/normal.awt-yi
+--- abiword-2.8.6/user/wp/templates/normal.awt-yi	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-yi	2011-07-02 15:37:19.919324814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_CN abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN
+--- abiword-2.8.6/user/wp/templates/normal.awt-zh_CN	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN	2011-07-02 15:37:20.015372813 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_TW abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW
+--- abiword-2.8.6/user/wp/templates/normal.awt-zh_TW	2007-01-20 13:20:58.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW	2011-07-02 15:37:19.907318814 -0300
+@@ -9,7 +9,7 @@
+ <!-- =====================================================================  -->
+ 
+ <styles>
+-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
++<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
+ <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
+diff -auNpr abiword-2.8.6/user/wp/templates/Press-Release.awt abiword-libre-2.8.6/user/wp/templates/Press-Release.awt
+--- abiword-2.8.6/user/wp/templates/Press-Release.awt	2009-05-22 07:15:33.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Press-Release.awt	2011-07-02 15:37:20.071400813 -0300
+@@ -16,19 +16,19 @@
+ <version id="3" started="1080258930" uid="0c5a8b0e-7ec0-11d8-92e5-d7901b3e7f1a" auto="0"/>
+ </history>
+ <styles>
+-<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:17pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
+-<s followedby="Press Release" name="Press Release" basedon="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0.1667in; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="About Companies" name="About Companies" basedon="Press Release" type="P" props="font-weight:normal; font-family:Arial; margin-top:0.1111in; font-style:normal; margin-left:0.7500in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.7500in; color:000000; font-size:10pt; line-height:1.000000; text-align:justify; widows:2; font-stretch:normal"/>
++<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:17pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
++<s followedby="Press Release" name="Press Release" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0.1667in; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="About Companies" name="About Companies" basedon="Press Release" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0.1111in; font-style:normal; margin-left:0.7500in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.7500in; color:000000; font-size:10pt; line-height:1.000000; text-align:justify; widows:2; font-stretch:normal"/>
+ <s type="P" name="Block Text" basedon="Normal" followedby="Current Settings" props="line-height:1.000000; margin-bottom:0.0833in; margin-right:1.0000in; margin-left:1.0000in"/>
+ <s type="P" name="Box List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Box List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Bullet List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Symbol; list-style:Bullet List; line-height:1.000000; text-indent:-0.300000in"/>
+-<s followedby="Normal" name="Chapter Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Chapter %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
++<s followedby="Normal" name="Chapter Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Chapter %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
+ <s followedby="Normal" name="Contents 1" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s followedby="Normal" name="Contents 2" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:1.0000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s followedby="Normal" name="Contents 3" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:1.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s followedby="Normal" name="Contents 4" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:2.0000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
+-<s followedby="Normal" name="Contents Header" basedon="Normal" type="P" props="margin-top:0.1667in; font-size:16pt; margin-bottom:0.0833in; text-align:center; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
++<s followedby="Normal" name="Contents Header" basedon="Normal" type="P" props="margin-top:0.1667in; font-size:16pt; margin-bottom:0.0833in; text-align:center; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
+ <s type="P" name="Dashed List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:NULL; list-style:Dashed List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Diamond List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Diamond List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="C" name="Endnote Reference" basedon="None" followedby="Current Settings" props="text-position:superscript; line-height:1.000000; font-size:10pt"/>
+@@ -36,19 +36,19 @@
+ <s type="C" name="Footnote Reference" basedon="None" followedby="Current Settings" props="text-position:superscript; line-height:1.000000; font-size:10pt"/>
+ <s type="C" name="Footnote Text" basedon="Normal" followedby="Current Settings" props="text-position:normal; line-height:1.000000; font-size:10pt"/>
+ <s type="P" name="Hand List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Hand List; line-height:1.000000; text-indent:-0.300000in"/>
+-<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:14pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
+-<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
+-<s followedby="Normal" name="Heading 4" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
++<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:14pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
++<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
++<s followedby="Normal" name="Heading 4" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
+ <s type="P" name="Heart List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Heart List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Implies List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Symbol; list-style:Implies List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Lower Case List" basedon="Numbered List" followedby="Current Settings" props="list-delim:%L); list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Lower Case List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Lower Roman List" basedon="Normal" followedby="Current Settings" props="list-delim:%L; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Lower Roman List; line-height:1.000000; text-indent:-0.300000in"/>
+-<s followedby="Normal" name="Numbered Heading 1" basedon="Heading 1" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
+-<s followedby="Normal" name="Numbered Heading 2" basedon="Heading 2" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
+-<s followedby="Normal" name="Numbered Heading 3" basedon="Heading 3" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
++<s followedby="Normal" name="Numbered Heading 1" basedon="Heading 1" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
++<s followedby="Normal" name="Numbered Heading 2" basedon="Heading 2" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
++<s followedby="Normal" name="Numbered Heading 3" basedon="Heading 3" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
+ <s type="P" name="Numbered List" followedby="Current Settings" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Plain Text" basedon="Normal" followedby="Current Settings" props="font-family:Courier New; line-height:1.000000"/>
+-<s followedby="Normal" name="Section Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Section %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
++<s followedby="Normal" name="Section Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Section %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
+ <s type="P" name="Square List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Square List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Star List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Star List; line-height:1.000000; text-indent:-0.300000in"/>
+ <s type="P" name="Tick List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Tick List; line-height:1.000000; text-indent:-0.300000in"/>
+@@ -77,7 +77,7 @@
+ <p style="Normal"><c props="lang:en-US"></c></p>
+ </cell>
+ <cell props="bot-attach:3; left-attach:0; right-attach:1; top-attach:2">
+-<p style="Normal" props="text-align:center"><c props="font-family:Arial; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">FOR IMMEDIATE RELEASE</c></p>
++<p style="Normal" props="text-align:center"><c props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">FOR IMMEDIATE RELEASE</c></p>
+ </cell>
+ </table>
+ <p></p>
+diff -auNpr abiword-2.8.6/user/wp/templates/Resume.awt abiword-libre-2.8.6/user/wp/templates/Resume.awt
+--- abiword-2.8.6/user/wp/templates/Resume.awt	2009-05-22 07:15:36.000000000 -0300
++++ abiword-libre-2.8.6/user/wp/templates/Resume.awt	2011-07-02 15:37:20.031380813 -0300
+@@ -14,11 +14,11 @@
+ <m key="abiword.date_last_changed">Fri Mar 12 22:08:25 2004</m>
+ </metadata>
+ <styles>
+-<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+-<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:20pt"/>
+-<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:11pt; margin-bottom:3pt; font-weight:normal; text-align:right; font-family:Arial; keep-with-next:1"/>
+-<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:9pt"/>
+-<s followedby="Heading 3" name="Brief" basedon="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0.2500in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:9pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
++<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:20pt"/>
++<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:11pt; margin-bottom:3pt; font-weight:normal; text-align:right; font-family:Liberation Sans; keep-with-next:1"/>
++<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:9pt"/>
++<s followedby="Heading 3" name="Brief" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0.2500in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:9pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
+ </styles>
+ <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
+ <section header="0" props="page-margin-footer:0.5in; page-margin-header:0.4375in; page-margin-top:1.1250in">
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index d8e5d8e4f..d822004e6 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=abuse-libre
 pkgver=0.8
 pkgrel=1
 pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://abuse.zoy.org/'
 license=('GPL' 'custom:PublicDomain')
 depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
diff --git a/libre/aspell-pl-libre/PKGBUILD b/libre/aspell-pl-libre/PKGBUILD
index f932a95d1..692b7b6eb 100644
--- a/libre/aspell-pl-libre/PKGBUILD
+++ b/libre/aspell-pl-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-pl-libre
 pkgver=20110907
 pkgrel=1
 pkgdesc="Polish dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sjp.pl/slownik/en/"
 license=('GPL' 'LGPL' 'MPL')
 depends=('aspell')
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 9cbde26be..0dc7a2830 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -15,12 +15,12 @@ license=('GPL' 'GPL3' 'LGPL' 'custom')
 # Licensing issues:
 # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
 # but I've been informed by an upstream dev, <nenolod>, that they are all GPL of some type.
-# 
+#
 # The plugin 'psf' is currently BSD+noncommercial, but is apparently being changed to GPL.
 # However, 'psf' is apparently an emulator for running non-free code, so I'll leave it out.
 #
 # All the other custom licensed plugins I think are mostly modified BSD or ISC.
- 
+
 provides=("audacious-plugins=$pkgver")
 replaces=("${pkgname%-libre}")
 conflicts=("${pkgname%-libre}")
@@ -99,7 +99,7 @@ build() {
 	head -n 17 unix-io/unix-io.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io
 	head -n 18 voice_removal/voice_removal.c   | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal
 	head -n 25 xsf/corlett.c		   | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs
-	l=${pkgdir}/usr/share/licenses/${pkgname}/	
+	l=${pkgdir}/usr/share/licenses/${pkgname}/
 	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
  	cd ..
 	pushd $tmpdir
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index a0c1b154d..cbb0aad47 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=audacity-libre
 pkgver=1.3.13
 pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
 depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
diff --git a/libre/aufs2-libre/PKGBUILD b/libre/aufs2-libre/PKGBUILD
index bd177ef9c..f12df73ae 100644
--- a/libre/aufs2-libre/PKGBUILD
+++ b/libre/aufs2-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 #_kernver=${pkgver%_*}-LIBRE
 _kernver=2.6.38-LIBRE
 pkgdesc="Another Unionfs Implementation for the Linux-Libre kernel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
 depends=('kernel26-libre>=2.6.38' 'kernel26-libre<2.6.39')
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index 8843af016..c836e7a24 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=crosstool-ng
 pkgver=1.13.0
 pkgrel=1
 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://crosstool-ng.org/"
 license=(GPL2)
 depends=('cvs' 'curl')
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
index 41c332dca..a0c4e3aba 100644
--- a/libre/ffmpeg-libre/PKGBUILD
+++ b/libre/ffmpeg-libre/PKGBUILD
@@ -8,14 +8,16 @@ pkgname=ffmpeg-libre
 pkgver=20110330
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ffmpeg.org/"
 license=('GPL')
 depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg')
 makedepends=('yasm' 'git')
 #git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
-md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz
+        ffmpeg-loongson.patch)
+md5sums=('dd682a876a496b9f9ae8afb3b3b70389'
+         'a178dab43d73388543689df4828fb2d2')
 #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
 provides=("ffmpeg=$pkgver")
 conflicts=('ffmpeg')
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index cfd053a4c..304336306 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=file-roller-libre
 pkgver=3.2.2
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index eda488048..81796c041 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ghostscript-libre
 pkgver=9.04
 pkgrel=5
 pkgdesc="An interpreter for the PostScript language without non-free files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3') #non free files removed
 depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
 makedepends=('gtk2' 'gnutls')
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 9f445eb1d..3680a5228 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -11,11 +11,12 @@ _grub2_ntldr_ver=17
 _grub2_915_ver=7
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
+[ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson')
 pkgbase="grub2"
 pkgver='1.99'
 pkgrel=4
 url="http://www.gnu.org/software/grub/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 epoch=1
 makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper')
@@ -61,6 +62,7 @@ build() {
 	_HOST="${CARCH}"
 
 	build_grub2-common_and_bios
+  [ "$CARCH" = "mips64el" ] || \
 	build_grub2-efi
 }
 
@@ -98,6 +100,17 @@ build_grub2-common_and_bios() {
 #	mkdir ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS
 #	cd ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS
   
+  if [ "$CARCH" = "mips64el" ]; then
+	CFLAGS="" ./configure \
+		--with-platform=yeeloong --enable-mm-debug \
+		--host=${CARCH}-unknown-linux-gnu \
+		--enable-grub-mkfont --prefix=/usr \
+		--bindir=/bin --sbindir=/sbin \
+		--mandir=/usr/share/man --infodir=/usr/share/info \
+		--sysconfdir=/etc --enable-nls \
+		--program-transform-name=s,grub,grub,
+	CFLAGS="" make 
+  else
 	CFLAGS="" ./configure \
 		--with-platform=pc --enable-mm-debug \
 		${_EFIEMU} --host=${CARCH}-unknown-linux-gnu \
@@ -107,6 +120,7 @@ build_grub2-common_and_bios() {
 		--sysconfdir=/etc --enable-nls \
 		--program-transform-name=s,grub,grub,
 	CFLAGS="" make 
+  fi
 }
 
 build_grub2-efi() {
@@ -204,3 +218,18 @@ package_grub2-efi-i386() {
         rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
         rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
 }
+
+# Same as -bios but different pkgdesc
+package_grub2-loongson() {
+	pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for Loogson"
+	depends=(grub2-common=${epoch}:${pkgver})
+	replaces=('grub2' 'grub2-libre')
+	provides=('grub2' 'grub2-libre')
+  
+	cd ${srcdir}/grub2_bios-${pkgver}
+	make DESTDIR=${pkgdir} install 
+
+	## remove non platform-specific files
+	rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
+	rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
+}
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 59fbf021b..c5dfd46d1 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -6,15 +6,17 @@ pkgbase=gstreamer0.10-bad-libre
 pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
 pkgver=0.10.22
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2)
+source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2
+        mpeg2enc-mjpegtools-2.0.patch)
 
 build() {
   cd "${srcdir}/gst-plugins-bad-${pkgver}"
+  patch -Np1 -i "${srcdir}/mpeg2enc-mjpegtools-2.0.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --with-package-name="GStreamer Bad Plugins (Parabola)" \
@@ -51,4 +53,5 @@ package_gstreamer0.10-bad-libre-plugins() {
   make -C sys DESTDIR="${pkgdir}" install
   make -C gst-libs DESTDIR="${pkgdir}" uninstall
 }
-md5sums=('9a2acee1f386f71247003d0d7090fb1c')
+md5sums=('9a2acee1f386f71247003d0d7090fb1c'
+         'e3068957abab56b474abf183adce7da3')
diff --git a/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch b/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch
new file mode 100644
index 000000000..771d75743
--- /dev/null
+++ b/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch
@@ -0,0 +1,26 @@
+From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001
+From: Götz Waschk <waschk@mandriva.org>
+Date: Tue, 24 May 2011 13:42:44 +0000
+Subject: mpeg2enc: support mjpegtools 2.0
+
+This adds conditional includes for the renamed headers in mjpegtools 2.0.
+Fixes: #650970.
+---
+diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc
+index acfda50..31f1a30 100644
+--- a/ext/mpeg2enc/gstmpeg2encoder.cc
++++ b/ext/mpeg2enc/gstmpeg2encoder.cc
+@@ -26,7 +26,10 @@
+ 
+ #include <mpegconsts.h>
+ #include <quantize.hh>
+-#if GST_MJPEGTOOLS_API >= 10900
++#if GST_MJPEGTOOLS_API >= 10903
++#include <ontheflyratectlpass1.hh>
++#include <ontheflyratectlpass2.hh>
++#elif GST_MJPEGTOOLS_API >= 10900
+ #include <ontheflyratectl.hh>
+ #include <pass1ratectl.hh>
+ #include <pass2ratectl.hh>
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 869d2f52a..73dffcdbd 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hardinfo
 pkgver=0.5.1
 pkgrel=2.1
 pkgdesc="A system information and benchmark tool."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 license=('GPL2')
 depends=('gtk2' 'libsoup' 'gnutls')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 718f03057..49df54186 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -83,6 +83,8 @@ build() {
   patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
   patch -Np1 -i "$srcdir/firefox-version.patch"
 
+  [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig
+
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
       browser/base/Makefile.in
diff --git a/libre/kdeutils-libre/PKGBUILD b/libre/kdeutils-libre/PKGBUILD
index 16fff37d3..f0256b815 100644
--- a/libre/kdeutils-libre/PKGBUILD
+++ b/libre/kdeutils-libre/PKGBUILD
@@ -18,7 +18,7 @@ pkgname=('kdeutils-ark-libre'
          'kdeutils-sweeper')
 pkgver=4.7.4
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeutils')
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index 7c444e8ff..b5eff57c2 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -8,7 +8,7 @@ _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.32
 pkgver=${_basekernel}.52
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://linux-libre.fsfla.org"
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD
index 205d81c1f..66d50a1bf 100644
--- a/libre/lame-libre/PKGBUILD
+++ b/libre/lame-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lame-libre
 pkgver=3.98.4
 pkgrel=3
 pkgdesc="An MP3 encoder and graphical frame analyzer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lame.sourceforge.net/"
 depends=('ncurses')
 makedepends=('nasm')
diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD
index 48d5ebe0f..22c6ecbd8 100644
--- a/libre/lesspipe-libre/PKGBUILD
+++ b/libre/lesspipe-libre/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.71
 pkgrel=1
 pkgdesc='an input filter for the pager less'
 depends=('less')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 optdepends=('rpmextract: support for rpm files'
 	    'fastjar: support for jar files'
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index c6e4ab588..d3f51d911 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=libquicktime
 pkgver=1.2.2
 pkgrel=3
 pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://libquicktime.sourceforge.net/"
 depends=('gtk2'  'ffmpeg'  'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index ecbba4e47..a6e4c89ad 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -29,7 +29,7 @@ build() {
     msg "Git checkout:  Tree has been updated"
   else
     msg "Git checkout:  Retrieving sources"
-    git clone ${_gitroot}  
+    git clone ${_gitroot}
   fi
   msg "Checkout completed"
  ## Build
@@ -50,6 +50,8 @@ package_libretools() {
   install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin
   install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin
   install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin
   install -m755 ${_gitname}/lb ${pkgdir}/usr/bin
   install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/
@@ -61,14 +63,16 @@ package_libretools() {
   install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
   install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
 
   install -d ${pkgdir}/usr/sbin
   install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
-  
+
   install -d ${pkgdir}/usr/share/pacman
   install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
+
+  install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
+  install -d -m 775 --group=users /var/lib/libretools/toru
 }
 
 package_libretools-pr() {
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ee55b4ba..76c631b72 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=liferea-libre
 pkgver=1.6.6b
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://liferea.sourceforge.net/"
 provides=("liferea=$pkgver")
 replaces=('liferea')
diff --git a/testing/linux-lts/linux-lts.preset b/libre/linux-libre/linux-libre.preset.mips64el
index fae522f39..7af90ba7a 100644
--- a/testing/linux-lts/linux-lts.preset
+++ b/libre/linux-libre/linux-libre.preset.mips64el
@@ -1,14 +1,14 @@
 # mkinitcpio preset file for the 'linux' package
 
 ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-lts"
+ALL_kver="/boot/vmlinuz-linux-libre"
 
 PRESETS=('default' 'fallback')
 
 #default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-lts.img"
+default_image="/boot/initramfs-linux-libre.img"
 #default_options=""
 
 #fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-fallback-lts.img" 
+fallback_image="/boot/initramfs-linux-libre-fallback.img" 
 fallback_options="-S autodetect"
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 46f7a75e8..2e7d14fe3 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname='mesa-demos-libre'
 pkgver=8.0.1
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="Mesa demos and tools, libre"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
diff --git a/libre/metalog/PKGBUILD b/libre/metalog/PKGBUILD
index dee52d986..c26467d36 100644
--- a/libre/metalog/PKGBUILD
+++ b/libre/metalog/PKGBUILD
@@ -39,5 +39,7 @@ package() {
   install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
   install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
 
-}
+# compat symlink
+  ln -s metalog $pkgdir/etc/rc.d/syslog-ng
 
+}
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 2602022f4..0c97f1d96 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -11,6 +11,11 @@ arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
 'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
+# no lirc
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
@@ -49,6 +54,10 @@ package_mplayer-libre() {
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
     'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
     'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
+[ "$CARCH" = "mips64el" ] && \
+    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
+    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 1904d4ec4..3b2aeb1ed 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=mplayer-vaapi-libre
 pkgver=34180
 _sha1=79e6aa7b
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 2e6ab6e01..ffd2f2d61 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -39,7 +39,7 @@ mksource() {
     msg "Removing unRar"
 # Generate patch
 #	sed -e '/Rar/d' -i makefile*
-#   find -name '*Rar*' -print0 | xargs -0 rm -rvf 
+#   find -name '*Rar*' -print0 | xargs -0 rm -rvf
 # Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
     patch -Np1 -i ../p7zip-libre.patch
 
@@ -51,12 +51,16 @@ mksource() {
 build() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
 
-        case $CARCH in
-            x86_64) cp makefile.linux_amd64_asm makefile.machine ;;
-            i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;;
-        esac
+  case $CARCH in
+	x86_64) cp makefile.linux_amd64_asm makefile.machine ;;
+	i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;;
+  esac
 
-        make all4 OPTFLAGS="${CXXFLAGS}"
+  if [ "$CARCH" = "mips64el" ]; then
+    make all3 OPTFLAGS="${CXXFLAGS}"
+  else
+    make all4 OPTFLAGS="${CXXFLAGS}"
+  fi
 }
 
 package() {
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 00ed5e69c..cd1f948f9 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -65,7 +65,7 @@ package() {
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
       myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-      myldflags=""
+      myldflags="-Wl,--as-needed"
       ;;
   esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
diff --git a/libre/pacman/makepkg.conf.mips64el b/libre/pacman/makepkg.conf.mips64el
new file mode 100644
index 000000000..ae090a1fa
--- /dev/null
+++ b/libre/pacman/makepkg.conf.mips64el
@@ -0,0 +1,114 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'rsync::/usr/bin/rsync -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/curl
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="@CARCH@"
+CHOST="@CHOST@"
+
+#-- Exclusive: will only run on @CARCH@
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="@CARCHFLAGS@"
+CXXFLAGS="@CARCHFLAGS@"
+#LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- fakeroot: Allow building packages as a non-root user
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#-- check:    Run the check() function if present in the PKGBUILD
+#
+BUILDENV=(fakeroot !distcc color !ccache check)
+#
+#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
+#-- specify a space-delimited list of hosts running in the DistCC cluster.
+#DISTCC_HOSTS=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge:     Remove files specified by PURGE_TARGETS
+#
+OPTIONS=(strip docs libtool emptydirs zipman purge)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john@doe.com>"
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
+SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:
diff --git a/libre/pacman/mips64el.patch b/libre/pacman/mips64el.patch
new file mode 100644
index 000000000..1dac6194f
--- /dev/null
+++ b/libre/pacman/mips64el.patch
@@ -0,0 +1,26 @@
+--- configure.ac.orig	2011-06-10 14:50:19.241750094 -0300
++++ configure.ac	2011-06-10 14:50:35.537678580 -0300
+@@ -271,6 +271,10 @@ case "${host}" in
+ 		CARCH="arm"
+ 		CARCHFLAGS="-march=armv4 "
+ 		;;
++	mips64el-*)
++		CARCH="mips64el"
++		CARCHFLAGS=""
++		;;
+ 	*)
+ 		AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]])
+ 		CARCH="unknown"
+--- configure.orig	2011-06-10 14:57:12.971308117 -0300
++++ configure	2011-06-10 14:56:49.963295618 -0300
+@@ -15673,6 +15673,10 @@ case "${host}" in
+ 		CARCH="arm"
+ 		CARCHFLAGS="-march=armv4 "
+ 		;;
++	mips64el-*)
++		CARCH="mips64el"
++		CARCHFLAGS=""
++		;;
+ 	*)
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your architecture is unknown for makepkg.conf, consider adding it to configure.ac" >&5
+ $as_echo "$as_me: WARNING: Your architecture is unknown for makepkg.conf, consider adding it to configure.ac" >&2;}
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD
index e0dfc9d9c..41e2a4d00 100644
--- a/libre/python-reportlab-libre/PKGBUILD
+++ b/libre/python-reportlab-libre/PKGBUILD
@@ -9,7 +9,7 @@ _origname=reportlab
 pkgver=2.5
 pkgrel=1
 pkgdesc="A proven industry-strength PDF generating solution"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging')
 license=('custom')
 source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
index c4f09188d..1e97a8f24 100644
--- a/libre/python2-libre/PKGBUILD
+++ b/libre/python2-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.7.2
 pkgrel=4
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PSF')
 url="http://www.python.org/"
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index a360e113e..cea9ca4d3 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rp-pppoe-libre
 pkgver=3.10
 pkgrel=7
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
 depends=('ppp>=2.4.5' 'sh' 'net-tools')
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 20f6ece4b..b5e29fd4c 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl-libre
 pkgver=1.2.14
 pkgrel=7.1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org"
 license=('LGPL')
 provides=("sdl=${pkgver}")
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
index 343f3e3ed..21fc89d96 100644
--- a/libre/seamonkey-libre/PKGBUILD
+++ b/libre/seamonkey-libre/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=seamonkey-libre
 pkgver=2.0.12
 pkgrel=1
 pkgdesc="SeaMonkey internet suite, with GNUZilla addons"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MPL')
 depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'gcc-libs' 'alsa-lib' 'dbus-glib')
 makedepends=('zip' 'pkg-config' 'libgnomeui>=2.24.2' 'python2' 'libidl2' 'autoconf2.13')
diff --git a/libre/sqlite3/PKGBUILD b/libre/sqlite3/PKGBUILD
index 2a939aa57..9e380bd73 100644
--- a/libre/sqlite3/PKGBUILD
+++ b/libre/sqlite3/PKGBUILD
@@ -13,7 +13,7 @@ _amalgamationver2=${_amalgamationver/00/}
 pkgver=${_amalgamationver2//0/.}
 pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.sqlite.org/"
 makedepends=('tcl' 'readline>=6.0.00')
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 0074fb878..403999967 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -244,7 +244,7 @@ package() {
    mkdir -p $pkgdir/usr/share/tlpkg/TeXLive
    install -m644 ${srcdir}/source/utils/biber/TeXLive/*.pm $pkgdir/usr/share/tlpkg/TeXLive
 
-   # create symlinks for formats 
+   # create symlinks for formats
    echo "--> Create symlinks for TeX formats ..."
    LD_PRELOAD="${pkgdir}/usr/lib/libkpathsea.so.6" PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
    #############################################################
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 6a517c112..d7bd9bb2e 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunderbird-libre
 pkgver=9.0.1
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/thunderbird/"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index a02607b28..84bab9c17 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=unarchiver
 pkgver=2.7.1
 pkgrel=3
 pkgdesc="An Objective-C application for uncompressing archive files"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://wakaba.c3.cx/s/apps/unarchiver.html"
 license=('LGPL2.1')
 depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
diff --git a/libre/unrar-libre/PKGBUILD b/libre/unrar-libre/PKGBUILD
index e08e90220..0096718b4 100644
--- a/libre/unrar-libre/PKGBUILD
+++ b/libre/unrar-libre/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=unrar-libre
 pkgver=0.0.1
 pkgrel=1
 pkgdesc="A free software library to decompress .rar files."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gna.org/projects/unrar/"
 license=('GPL')
 provides=(unrar)
diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 20c3885f9..d49c373bc 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=unzip-libre
 pkgver=6.0
 pkgrel=5
 pkgdesc="Unpacks .zip archives such as those made by PKZIP"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.info-zip.org/"
 license=('custom')
 depends=('bzip2' 'bash')
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 001873ad3..70a105323 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xarchiver-libre
 pkgver=0.5.2
 pkgrel=4
 pkgdesc="GTK+ frontend to various command line archivers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xarchiver.sourceforge.net"
 license=('GPL')
 groups=('xfce4-goodies')
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index f04ec2f47..a8092476a 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xchat-libre
 pkgver=2.8.8
 pkgrel=7
 pkgdesc="A GTK+ based IRC client without non-free browser reference"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xchat.org/"
 provides=("xchat=$pkgver")
 replaces=('xchat')
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 aa0488509..000000000
--- a/multilib-staging/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 62049 2012-01-14 23:53:37Z heftig $
-# 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=2
-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/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index 1db3a2749..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,303 +0,0 @@
-# $Id: PKGBUILD 62102 2012-01-16 01:54:25Z 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-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-testing/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-testing/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-testing/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-testing/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-testing/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch b/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
deleted file mode 100644
index 73df6b873..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h
---- gcc-4.6-20111223/gcc/config/i386/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h	2012-01-14 19:52:33.688573352 +0100
-@@ -63,7 +63,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64
---- gcc-4.6-20111223/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64	2012-01-14 19:50:27.346242617 +0100
-@@ -25,7 +25,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/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-gdk-pixbuf2/PKGBUILD b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index eef9aca26..000000000
--- a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.1
-pkgrel=1
-pkgdesc="An image loading library (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11
-         $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool' '!docs')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  ./configure --prefix=/usr  --libdir=/usr/lib32 \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32
-  rm gdk-pixbuf-csource
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 92d58ef04..000000000
--- a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD
deleted file mode 100644
index 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-pango/PKGBUILD b/multilib-testing/lib32-pango/PKGBUILD
deleted file mode 100644
index e0c677b12..000000000
--- a/multilib-testing/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 62109 2012-01-16 01:55:13Z heftig $
-# 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=2
-pkgdesc="A library for layout and rendering of text (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-glib2>=2.25.15' 'lib32-cairo>=1.10.0' 'lib32-libxft>=2.1.14'
-         'lib32-freetype2>=2.4.2' $_pkgbasename)
-makedepends=("gcc-multilib")
-options=('!libtool' '!emptydirs')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.29/${_pkgbasename}-${pkgver}.tar.xz
-        pango-modules-conffile.patch)
-url="http://www.pango.org/"
-sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f'
-            '4a178b60dd420ae53baeabbecfaaeca4070a4b777b2b3f36d137cd70b5a270c3')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -p0 < ${srcdir}/pango-modules-conffile.patch
-  # No libthai support yet
-  ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc \
-      --with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \
-      --disable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "$pkgdir"/etc
-  rm -rf "$pkgdir"/usr/{bin/pango-view,share,include}
-  mv "$pkgdir"/usr/bin/pango-querymodules "$pkgdir"/usr/bin/pango-querymodules-32
-}
diff --git a/multilib-testing/lib32-pango/pango-modules-conffile.patch b/multilib-testing/lib32-pango/pango-modules-conffile.patch
deleted file mode 100644
index a959cf1c8..000000000
--- a/multilib-testing/lib32-pango/pango-modules-conffile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pango/modules.c.orig	2010-08-26 06:45:49.329259966 +0200
-+++ pango/modules.c	2010-08-26 06:46:13.786685177 +0200
-@@ -529,7 +529,7 @@
- 
-   if (!file_str)
-     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
--				 "pango.modules",
-+				 "pango.modules-32",
- 				 NULL);
- 
-   files = pango_split_file_list (file_str);
-@@ -640,7 +640,7 @@
-       if (!no_module_warning)
- 	{
- 	  gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
--					      "pango.modules",
-+					      "pango.modules-32",
- 					      NULL);
- 	  g_critical ("No modules found:\n"
- 		      "No builtin or dynamically loaded modules were found.\n"
diff --git a/multilib-testing/lib32-pango/pango.install b/multilib-testing/lib32-pango/pango.install
deleted file mode 100644
index 173b6820f..000000000
--- a/multilib-testing/lib32-pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules-32 >etc/pango/pango.modules-32
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f etc/pango/pango.modules-32 ]; then
-		rm etc/pango/pango.modules-32
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules-32
-}
diff --git a/multilib-testing/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-testing/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD
deleted file mode 100644
index ef3a5008f..000000000
--- a/multilib-testing/wine/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 62113 2012-01-16 01:55:33Z heftig $
-# 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=1.1
-
-_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
-  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
-  lcms            lib32-lcms
-  libxml2         lib32-libxml2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  oss             cups
-)
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-else
-  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts=('bin32-wine' 'wine-wow64')
-  replaces=('bin32-wine')
-fi
-
-build() {
-  cd "$srcdir"
-
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build
-
-  # These additional CFLAGS solve FS#27662
-  export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-  export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
-
-    mkdir $pkgname-64-build
-    cd "$srcdir/$pkgname-64-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --libdir=/usr/lib \
-      --with-x \
-      --enable-win64
-
-    make
-
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$pkgname-64-build"
-    )
-
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-x \
-    "${_wine32opts[@]}"
-
-  # These additional CFLAGS solve FS#27560
-  make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign"
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib32" \
-      dlldir="$pkgdir/usr/lib32/wine" install
-
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/multilib-testing/wine/wine.install b/multilib-testing/wine/wine.install
deleted file mode 100644
index 0548b7ffd..000000000
--- a/multilib-testing/wine/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
-	update-desktop-database -q
-}
diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD
deleted file mode 100644
index f80d4cfe9..000000000
--- a/multilib/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 62199 2012-01-18 10:46:41Z 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/binutils-multilib/binutils.install b/multilib/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib/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/chuck/PKGBUILD b/multilib/chuck/PKGBUILD
deleted file mode 100644
index a06c7da6a..000000000
--- a/multilib/chuck/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62200 2012-01-18 10:46:43Z 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/dev86/PKGBUILD b/multilib/dev86/PKGBUILD
deleted file mode 100644
index bde7ba3be..000000000
--- a/multilib/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/dev86/dev86-0.16.17-fortify.patch b/multilib/dev86/dev86-0.16.17-fortify.patch
deleted file mode 100644
index 715d0c4ca..000000000
--- a/multilib/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/dev86/dev86-pic.patch b/multilib/dev86/dev86-pic.patch
deleted file mode 100644
index 439c2648b..000000000
--- a/multilib/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/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
deleted file mode 100644
index da692dc93..000000000
--- a/multilib/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,309 +0,0 @@
-# $Id: PKGBUILD 62758 2012-01-26 04:44:57Z 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=6
-_snapshot=4.6-20120120
-_libstdcppmanver=20111215
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
-             'lib32-glibc>=2.14')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64-multilib.patch
-	gcc-hash-style-both.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
-         '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 \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --enable-multilib --disable-libssp \
-      --enable-checking=release --with-fpmath=sse
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
-  provides=("gcc-libs=$pkgver-$pkgrel")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -rf ${pkgdir}/usr/lib32
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm ${pkgdir}/usr/lib32/libgfortran.spec
-
-  # remove stuff in gcc-libs-multilib
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/info
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl')
-  groups=('multilib-devel')
-  provides=("gcc=$pkgver-$pkgrel")
-  conflicts=('gcc')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib{,32}/*.so*
-  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib{,32}/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-  # plugin headers are all over the place at the moment...
-  for i in common objc pragma pretty-print; do
-    ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
-  done
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
-  pkgdesc="Fortran front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-fortran=$pkgver-$pkgrel")
-  conflicts=('gcc-fortran')
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
-  pkgdesc="Objective-C front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-objc=$pkgver-$pkgrel")
-  conflicts=('gcc-objc')
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
-  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-ada=$pkgver-$pkgrel")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  cd ../$CHOST/32/libada
-  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
-    INSTALL_DATA="install -m644" install-gnatlib
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib/gcc-multilib/gcc-ada.install b/multilib/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib/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/gcc-multilib/gcc-fortran.install b/multilib/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib/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/gcc-multilib/gcc-go.install b/multilib/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib/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/gcc-multilib/gcc-hash-style-both.patch b/multilib/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib/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/gcc-multilib/gcc-libs.install b/multilib/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib/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/gcc-multilib/gcc.install b/multilib/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib/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/gcc-multilib/gcc_pure64-multilib.patch b/multilib/gcc-multilib/gcc_pure64-multilib.patch
deleted file mode 100644
index 73df6b873..000000000
--- a/multilib/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/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/jack2-multilib/40-hpet-permissions.rules b/multilib/jack2-multilib/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/multilib/jack2-multilib/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/multilib/jack2-multilib/99-audio.conf b/multilib/jack2-multilib/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/multilib/jack2-multilib/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD
deleted file mode 100644
index 6c45b64d6..000000000
--- a/multilib/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/lib32-acl/PKGBUILD b/multilib/lib32-acl/PKGBUILD
deleted file mode 100644
index 6654ef38c..000000000
--- a/multilib/lib32-acl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 57960 2011-11-04 22:18:21Z lcarlier $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=lib32-acl
-pkgver=2.2.51
-pkgrel=2
-pkgdesc="Access control list libraries (32-bit)"
-arch=('x86_64')
-url="http://savannah.nongnu.org/projects/acl"
-license=('LGPL')
-depends=('lib32-attr>=2.4.46' 'acl')
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://download.savannah.gnu.org/releases/acl/acl-${pkgver}.src.tar.gz)
-sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
-
-build() {
-  cd "${srcdir}/acl-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  export INSTALL_USER=root INSTALL_GROUP=root 
-  ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32
-  make 
-}
-
-package() {
-  cd "${srcdir}/acl-${pkgver}"
-
-  make DIST_ROOT="${pkgdir}" install install-lib install-dev
-
-  rm -rf ${pkgdir}/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-alsa-lib/PKGBUILD b/multilib/lib32-alsa-lib/PKGBUILD
deleted file mode 100644
index 8dff0f1d3..000000000
--- a/multilib/lib32-alsa-lib/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 40235 2011-02-22 08:22:12Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=alsa-lib
-pkgname=lib32-${_pkgbasename}
-pkgver=1.0.24.1
-pkgrel=1
-pkgdesc="An alternative implementation of Linux sound support (32 bit)"
-arch=('x86_64')
-url="http://www.alsa-project.org"
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib')
-license=('GPL')
-options=(!libtool)
-source=(ftp://ftp.alsa-project.org/pub/lib/${_pkgbasename}-$pkgver.tar.bz2)
-
-build() {
-  cd $srcdir/${_pkgbasename}-$pkgver
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-  ./configure --prefix=/usr --libdir=/usr/lib32 --disable-python
-  make
-}
-
-package() {
-  cd $srcdir/${_pkgbasename}-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # Clean up lib32 package
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
-md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226')
diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD
deleted file mode 100644
index bcb47a8e7..000000000
--- a/multilib/lib32-alsa-oss/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 57964 2011-11-04 22:23:42Z lcarlier $
-# Maintainer: judd <jvinet@zeroflux.org>
-
-_pkgbasename=alsa-oss
-pkgname=lib32-${_pkgbasename}
-pkgver=1.0.17
-pkgrel=3
-pkgdesc="OSS compatibility library (32 bit)"
-arch=(x86_64)
-license=('GPL')
-url="http://www.alsa-project.org"
-options=(!libtool)
-depends=('lib32-glibc' 'lib32-alsa-lib' 'alsa-oss')
-source=(ftp://ftp.alsa-project.org/pub/oss-lib/${_pkgbasename}-$pkgver.tar.bz2)
-md5sums=('1b1850c2fc91476a73d50f537cbd402f')
-
-build() {
-  cd $srcdir/${_pkgbasename}-$pkgver
-
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-  ./configure --prefix=/usr  --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd $srcdir/${_pkgbasename}-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # Clean up lib32 package
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-alsa-plugins/PKGBUILD b/multilib/lib32-alsa-plugins/PKGBUILD
deleted file mode 100644
index 4a0ce214d..000000000
--- a/multilib/lib32-alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 40238 2011-02-22 08:27:39Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=alsa-plugins
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.24
-pkgrel=1
-pkgdesc="Extra alsa plugins (32-bit)"
-arch=(x86_64)
-url="http://www.alsa-project.org"
-license=(GPL)
-depends=(lib32-alsa-lib $_pkgbasename)
-makedepends=(lib32-{libpulse,jack,speex,libsamplerate} gcc-multilib)
-optdepends=('lib32-libpulse: PulseAudio plugin'
-            'lib32-jack: Jack plugin'
-            'lib32-libsamplerate: libsamplerate resampling plugin'
-            'lib32-speex: libspeexdsp resampling plugin')
-options=('!libtool')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2")
-md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 --disable-avcodec
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/multilib/lib32-atk/PKGBUILD b/multilib/lib32-atk/PKGBUILD
deleted file mode 100644
index 89fdf434c..000000000
--- a/multilib/lib32-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 56310 2011-10-05 14:32:13Z bluewind $
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: Mikko Seppälä <t-r-a-y@mbnet.fi>
-_pkgbasename=atk
-pkgname=lib32-$_pkgbasename
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-glib2>=2.25.17' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-url='http://www.gtk.org/'
-sha256sums=('8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d')
-
-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 \
-    --disable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-}
diff --git a/multilib/lib32-attr/PKGBUILD b/multilib/lib32-attr/PKGBUILD
deleted file mode 100644
index 3f5840333..000000000
--- a/multilib/lib32-attr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 61159 2011-12-22 21:02:10Z lcarlier $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-_pkgbasename=attr
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.46
-pkgrel=2
-pkgdesc="Extended attribute support library for ACL support (32-bit)"
-arch=(x86_64)
-url="http://savannah.nongnu.org/projects/attr"
-license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename) 
-makedepends=('gcc-multilib' 'gettext')
-options=('!libtool')
-source=(http://download.savannah.gnu.org/releases/attr/attr-${pkgver}.src.tar.gz)
-sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
-
-build() {
-  cd ${srcdir}/attr-${pkgver} 
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  export INSTALL_USER=root INSTALL_GROUP=root
-  ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32
-  make 
-
-  # Doesn't like building as non-root
-
-#  make prefix=${pkgdir}/usr \
-#    PKG_LIB_DIR=$pkgdir/usr/lib32 \
-#    PKG_DEVLIB_DIR=$pkgdir/usr/lib32 \
-  make DIST_ROOT="${pkgdir}" \
-    install-lib install-dev
-
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-bzip2/PKGBUILD b/multilib/lib32-bzip2/PKGBUILD
deleted file mode 100644
index 3b81ad3ec..000000000
--- a/multilib/lib32-bzip2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-#$Id: PKGBUILD 53422 2011-08-03 14:41:13Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: TryA <tryagainprod {at} gmail.com>
-
-_pkgbasename=bzip2
-pkgname=lib32-bzip2
-pkgver=1.0.6
-pkgrel=1
-pkgdesc="A high-quality data compression program (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://sources.redhat.com/bzip2"
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib')
-source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz)
-md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  sed -i "s|CC=gcc|CC=gcc -m32|" Makefile
-  sed -i "s|CC=gcc|CC=gcc -m32|" Makefile-libbz2_so
-
-  # add large-file support
-  sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so
-
-  # use our optimization
-  sed -i "s|-O2|${CFLAGS}|g" Makefile
-  sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
-
-  make -f Makefile-libbz2_so
-  make libbz2.a
-}
-
-package(){
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  install -Dm755 libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so.1.0.6
-  ln -s libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so
-  ln -s libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so.1
-  ln -s libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so.1.0
-
-  install -Dm644 libbz2.a ${pkgdir}/usr/lib32/libbz2.a
-}
diff --git a/multilib/lib32-cairo/PKGBUILD b/multilib/lib32-cairo/PKGBUILD
deleted file mode 100644
index a8cbc6b72..000000000
--- a/multilib/lib32-cairo/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 43547 2011-03-27 14:25:07Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.10.2
-pkgrel=2
-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/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/multilib/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/lib32-celt/PKGBUILD b/multilib/lib32-celt/PKGBUILD
deleted file mode 100644
index 8c4124eb7..000000000
--- a/multilib/lib32-celt/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: see .contrib
-
-_realname=celt
-pkgname=lib32-$_realname
-pkgver=0.11.1
-pkgrel=1
-pkgdesc='Low-latency audio communication codec (32 bit)'
-arch=('x86_64')
-url='http://www.celt-codec.org'
-license=('BSD')
-depends=('lib32-glibc' "$_realname=$pkgver")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=("http://downloads.xiph.org/releases/$_realname/$_realname-$pkgver.tar.gz")
-md5sums=('94fe4acd241da8702c295bcd13a555e6')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make -C libcelt
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir" install-pkgconfigDATA
-  make -C libcelt DESTDIR="$pkgdir" install
-
-  # remove unneeded stuff
-  rm -rf "$pkgdir/usr/include"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-dbus-core/PKGBUILD b/multilib/lib32-dbus-core/PKGBUILD
deleted file mode 100644
index 79ebc590e..000000000
--- a/multilib/lib32-dbus-core/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 60258 2011-12-08 19:35:30Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=lib32-dbus-core
-_pkgbasename=dbus-core
-pkgver=1.4.16
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system (32-bit)"
-arch=('x86_64')
-url="http://www.freedesktop.org/Software/dbus"
-license=('GPL' 'custom')
-depends=('lib32-glibc' 'lib32-expat' 'dbus-core')
-makedepends=('gcc-multilib' lib32-libx11)
-options=(!libtool)
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz)
-md5sums=('44a2a10678e7e50460879c3eb4453a65')
-
-build() {
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-    cd "${srcdir}/dbus-${pkgver}"
-
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
-        --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-        --with-system-pid-file=/var/run/dbus.pid \
-        --enable-inotify --disable-dnotify \
-        --disable-verbose-mode --disable-static \
-        --disable-tests --disable-asserts
-    make
-}
-
-package() {
-    cd "${srcdir}/dbus-${pkgver}"
-    make DESTDIR=${pkgdir} install
-
-    rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
-    rm -rf "${pkgdir}"/{etc,var}
-
-    mkdir -p "${pkgdir}/usr/share/licenses"
-    ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
diff --git a/multilib/lib32-e2fsprogs/PKGBUILD b/multilib/lib32-e2fsprogs/PKGBUILD
deleted file mode 100644
index ca7e2eb25..000000000
--- a/multilib/lib32-e2fsprogs/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: mightyjaym <jm.ambrosino@free.fr>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=e2fsprogs
-pkgname=lib32-e2fsprogs
-pkgver=1.41.14
-pkgrel=2
-pkgdesc="Ext2 filesystem libraries (32-bit)"
-arch=(x86_64)
-license=('GPL' 'LGPL' 'MIT')
-url="http://e2fsprogs.sourceforge.net"
-depends=('lib32-util-linux' $_pkgbasename)
-makedepends=('bc' 'gcc-multilib')
-source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz")
-sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5')
-
-
-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 --with-root-prefix="" --enable-elf-shlibs \
-      --disable-{debugfs,imager,resizer,fsck,uuidd,libuuid,libblkid}
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-libs
-
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-expat/CVE-2009-3560.patch b/multilib/lib32-expat/CVE-2009-3560.patch
deleted file mode 100644
index 5fe9c36c8..000000000
--- a/multilib/lib32-expat/CVE-2009-3560.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
---- trunk~/lib/xmlparse.c	2007-05-08 04:25:35.000000000 +0200
-+++ trunk/lib/xmlparse.c	2009-12-29 21:57:22.141732904 +0100
-@@ -3703,6 +3703,9 @@
-         return XML_ERROR_UNCLOSED_TOKEN;
-       case XML_TOK_PARTIAL_CHAR:
-         return XML_ERROR_PARTIAL_CHAR;
-+      case -XML_TOK_PROLOG_S:
-+        tok = -tok;
-+        break;
-       case XML_TOK_NONE:
- #ifdef XML_DTD
-         /* for internal PE NOT referenced between declarations */
diff --git a/multilib/lib32-expat/CVE-2009-3720.patch b/multilib/lib32-expat/CVE-2009-3720.patch
deleted file mode 100644
index 65d16431f..000000000
--- a/multilib/lib32-expat/CVE-2009-3720.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
---- trunk~/lib/xmltok_impl.c	2006-11-26 18:34:46.000000000 +0100
-+++ trunk/lib/xmltok_impl.c	2009-10-22 21:42:41.000000000 +0200
-@@ -1744,7 +1744,7 @@
-                        const char *end,
-                        POSITION *pos)
- {
--  while (ptr != end) {
-+  while (ptr < end) {
-     switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
-     case BT_LEAD ## n: \
diff --git a/multilib/lib32-expat/PKGBUILD b/multilib/lib32-expat/PKGBUILD
deleted file mode 100644
index c50cb9c79..000000000
--- a/multilib/lib32-expat/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 26535 2010-09-15 22:31:07Z bluewind $
-
-_pkgbasename=expat
-pkgname=lib32-${_pkgbasename}
-pkgver=2.0.1
-pkgrel=7
-pkgdesc="An XML Parser library written in C (32 bit)"
-arch=('x86_64')
-url="http://expat.sourceforge.net/"
-license=('custom')
-makedepends=('gcc-multilib')
-depends=('lib32-glibc' "${_pkgbasename}")
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/expat/${_pkgbasename}-${pkgver}.tar.gz
-        CVE-2009-3560.patch
-        CVE-2009-3720.patch)
-md5sums=('ee8b492592568805593f81f8cdf2a04c'
-         '50603cac0f03aabc7087415251f592be'
-         'f3eeb796f28945899216b815e5901996')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i $srcdir/CVE-2009-3560.patch
-  patch -Np1 -i $srcdir/CVE-2009-3720.patch
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-  ./configure --prefix=/usr --libdir=/usr/lib32 --mandir=/usr/share/man 
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/"
-  ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  # Clean up lib32 package
-  rm -rf "${pkgdir}"/usr/{bin,include,share/man}
-}
diff --git a/multilib/lib32-flac/PKGBUILD b/multilib/lib32-flac/PKGBUILD
deleted file mode 100644
index 00c2b8791..000000000
--- a/multilib/lib32-flac/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 26539 2010-09-15 22:31:33Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=flac
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.1
-pkgrel=7
-pkgdesc="Free Lossless Audio Codec (32-bit)"
-arch=('x86_64')
-url="http://flac.sourceforge.net/"
-license=('custom:Xiph' 'LGPL' 'GPL' 'FDL')
-depends=('lib32-libogg' 'lib32-gcc-libs' $_pkgbasename)
-makedepends=('nasm' gcc-multilib)
-options=('!libtool' '!makeflags')
-source=(http://downloads.sf.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz
-        flac-1.2.1-gcc-4.3-includes.patch)
-md5sums=('153c8b15a54da428d1f0fadc756c22c7'
-         'b9d245422bbc547b18a72897366bea77')
-sha1sums=('bd54354900181b59db3089347cc84ad81e410b38'
-          '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  patch -Np1 -i ${srcdir}/flac-1.2.1-gcc-4.3-includes.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \
-              --disable-rpath --libdir=/usr/lib32
-  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/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch b/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch
deleted file mode 100644
index 52fec8be5..000000000
--- a/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp	2007-09-13 09:58:03.000000000 -0600
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
- 
diff --git a/multilib/lib32-fontconfig/30-urw-aliases.patch b/multilib/lib32-fontconfig/30-urw-aliases.patch
deleted file mode 100644
index 8077b869e..000000000
--- a/multilib/lib32-fontconfig/30-urw-aliases.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/conf.d/30-urw-aliases.conf	2009-08-06 16:23:57.000000000 +0100
-+++ b/conf.d/30-urw-aliases.conf	2009-08-06 16:25:07.000000000 +0100
-@@ -29,6 +29,10 @@
- 	  <family>Zapf Dingbats</family>
- 	  <accept><family>Dingbats</family></accept>
- 	</alias>
-+	<alias binding="same">
-+	  <family>ZapfDingbats</family>
-+	  <accept><family>Dingbats</family></accept>
-+	</alias>
- 	<match target="pattern">
- 	  <test name="family">
- 	    <string>Symbol</string>
diff --git a/multilib/lib32-fontconfig/PKGBUILD b/multilib/lib32-fontconfig/PKGBUILD
deleted file mode 100644
index 36f52ba32..000000000
--- a/multilib/lib32-fontconfig/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 26542 2010-09-15 22:31:59Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=fontconfig
-pkgname=lib32-$_pkgbasename
-pkgver=2.8.0
-pkgrel=3
-pkgdesc="A library for configuring and customizing font access (32-bit)"
-arch=(x86_64)
-url="http://www.fontconfig.org/release/"
-license=('custom')
-depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz
-        30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
-         '51bc6cb633b50f3c28793361738aac5b')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "${srcdir}/30-urw-aliases.patch"
-  # enable Position Independent Code for prelinking
-  export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir"/{etc,var}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-freetype2/PKGBUILD b/multilib/lib32-freetype2/PKGBUILD
deleted file mode 100644
index 434785cd9..000000000
--- a/multilib/lib32-freetype2/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 59294 2011-11-22 20:49:51Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.8
-pkgrel=1
-pkgdesc="TrueType font rendering library (32-bit)"
-arch=(x86_64)
-license=('GPL')
-url="http://freetype.sourceforge.net"
-depends=('lib32-zlib' 'lib32-bzip2' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
-        freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch)
-md5sums=('dbf2caca1d3afd410a29217a9809d397'
-         '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/freetype-${pkgver}"
-  patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
-  patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/freetype-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch b/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f..000000000
--- a/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
- 
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch b/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch
deleted file mode 100644
index 8432e28a4..000000000
--- a/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
-   /* This is done to allow FreeType clients to run unmodified, forcing     */
-   /* them to display normal gray-level anti-aliased glyphs.                */
-   /*                                                                       */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- 
- 
-   /*************************************************************************/
diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index eef9aca26..000000000
--- a/multilib/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=1
-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/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 92d58ef04..000000000
--- a/multilib/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/lib32-gettext/PKGBUILD b/multilib/lib32-gettext/PKGBUILD
deleted file mode 100644
index 94f9b4aa5..000000000
--- a/multilib/lib32-gettext/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Joakim Hernberg <jhernberg at alchemy dot lu>
-_pkgbasename=gettext
-pkgname=lib32-$_pkgbasename
-pkgver=0.18.1.1
-pkgrel=2
-pkgdesc="GNU internationalization library (32-bit)"
-arch=('x86_64')
-url="http://www.gnu.org/software/gettext/"
-license=('GPL')
-depends=('lib32-acl' $_pkgbasename)
-makedepends=(gcc-multilib)
-optdepends=('cvs: for autopoint tool')
-options=(!libtool !docs)
-source=(ftp://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('3dd55b952826d2b32f51308f2f91aa89')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c
-  ./configure --prefix=/usr --enable-csharp --libdir=/usr/lib32
-  make
-}
-
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-giflib/PKGBUILD b/multilib/lib32-giflib/PKGBUILD
deleted file mode 100644
index a311cfa8e..000000000
--- a/multilib/lib32-giflib/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
-# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
-# Contributor: mightyjaym <jm.ambrosino@free.fr>
-
-_pkgbasename=giflib
-pkgname=lib32-$_pkgbasename
-pkgver=4.1.6
-pkgrel=5
-pkgdesc="A library for reading and writing gif images (32-bit)"
-url="http://sourceforge.net/projects/giflib/"
-arch=('x86_64')
-license=('MIT')
-depends=('lib32-libx11' 'lib32-libsm' $_pkgbasename)
-makedepends=(gcc-multilib)
-provides=("lib32-libungif=${pkgver}")
-conflicts=('lib32-libungif')
-replaces=('lib32-libungif')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/giflib/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('7125644155ae6ad33dbc9fc15a14735f')
-
-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
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  # libungif compatibility - instructions taken from Redhat specfile
-  MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'`
-  gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver}
-  install -m755 libungif.so.${pkgver} ${pkgdir}/usr/lib32/
-  ln -sf libungif.so.${pkgver} ${pkgdir}/usr/lib32/libungif.so.4
-  ln -sf libungif.so.4 ${pkgdir}/usr/lib32/libungif.so
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  install -m755 -d ${pkgdir}/usr/share/licenses
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-glew/PKGBUILD b/multilib/lib32-glew/PKGBUILD
deleted file mode 100644
index 57a7580e9..000000000
--- a/multilib/lib32-glew/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 55986 2011-09-28 09:25:54Z bluewind $
-# Maintainer: Florian Pritz <flo@xinu.at>
-
-_pkgbasename=glew
-pkgname=lib32-$_pkgbasename
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="A cross-platform C/C++ extension loading library (32 bit)"
-arch=('x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('lib32-libxmu' 'lib32-libxi' 'lib32-mesa' "$_pkgbasename>=$pkgver")
-makedepends=('gcc-multilib')
-source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz)
-sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux
-  sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux
-  sed -i 's|lib64|lib32|' config/Makefile.linux
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make GLEW_DEST="${pkgdir}/usr" install
-  chmod 0755 "${pkgdir}/usr/lib32/libGLEW.so.${pkgver}"
-
-  rm -rf "${pkgdir}"/usr/{include,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-glib/PKGBUILD b/multilib/lib32-glib/PKGBUILD
deleted file mode 100644
index a863c66f6..000000000
--- a/multilib/lib32-glib/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 29612 2010-10-17 13:00:45Z pschmitz $
-
-_pkgbasename=glib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.10
-pkgrel=11
-pkgdesc="Common C routines used by Gtk+ and other libs (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('lib32-glibc' "${_pkgbasename}")
-makedepends=('gcc-multilib')
-options=('!libtool' '!docs')
-source=("ftp://ftp.gtk.org/pub/gtk/v1.2/${_pkgbasename}-${pkgver}.tar.gz"
-        'gcc340.patch'
-        'aclocal-fixes.patch')
-md5sums=('6fe30dad87c77b91b632def29dd69ef9'
-         '877b3330e822a4be69a0f8a8c268cfd7'
-         'e52c4b88427b9785bb8049dbdc9ff6fb')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd ${srcdir}/${_pkgbasename}-${pkgver}
-	patch -Np1 -i ../gcc340.patch
-	patch -Np0 -i ../aclocal-fixes.patch
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--libdir=/usr/lib32 \
-		--infodir=/usr/share/info \
-		--host=x86_64-unknown-linux-gnu \
-		--target=x86_64-unknown-linux-gnu
-	make
-}
-
-package() {
-	cd ${srcdir}/${_pkgbasename}-${pkgver}
-	make DESTDIR=${pkgdir} install
-	rm -rf "${pkgdir}"/usr/{share,include,bin,lib32/glib}
-}
diff --git a/multilib/lib32-glib/aclocal-fixes.patch b/multilib/lib32-glib/aclocal-fixes.patch
deleted file mode 100644
index b064074aa..000000000
--- a/multilib/lib32-glib/aclocal-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib.m4.orig	2006-03-05 13:13:24.000000000 +0000
-+++ glib.m4	2006-03-05 13:13:35.000000000 +0000
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl 
- dnl Get the cflags and libraries from the glib-config script
- dnl
diff --git a/multilib/lib32-glib/gcc340.patch b/multilib/lib32-glib/gcc340.patch
deleted file mode 100644
index 941111ae7..000000000
--- a/multilib/lib32-glib/gcc340.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
---- glib-1.2.10.orig/glib.h	2001-02-27 04:44:38.000000000 +0100
-+++ glib-1.2.10/glib.h	2004-05-27 15:50:32.436527848 +0200
-@@ -271,8 +271,10 @@
- 
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
-  * macros, so we can refer to them as strings unconditionally.
-+ *
-+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
-  */
--#ifdef	__GNUC__
-+#if	defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #define	G_GNUC_FUNCTION		__FUNCTION__
- #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
- #else	/* !__GNUC__ */
diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD
deleted file mode 100644
index 24695d4a6..000000000
--- a/multilib/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 62205 2012-01-18 10:47:06Z 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/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
deleted file mode 100644
index 9b962e426..000000000
--- a/multilib/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,176 +0,0 @@
-# $Id: PKGBUILD 62206 2012-01-18 10:47:20Z 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/lib32-glibc/glibc-2.10-bz4781.patch b/multilib/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib/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/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib/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/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib/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/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib/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/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib/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/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/multilib/lib32-glibc/glibc-2.15-lddebug-scopes.patch b/multilib/lib32-glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/multilib/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/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-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/multilib/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/lib32-glibc/glibc-__i686.patch b/multilib/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib/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/lib32-glibc/lib32-glibc.conf b/multilib/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index 9b08c3f43..000000000
--- a/multilib/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib32
diff --git a/multilib/lib32-gmp/538dfce27f41.patch b/multilib/lib32-gmp/538dfce27f41.patch
deleted file mode 100644
index 2e0a1af50..000000000
--- a/multilib/lib32-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/multilib/lib32-gmp/PKGBUILD b/multilib/lib32-gmp/PKGBUILD
deleted file mode 100644
index e6e82e060..000000000
--- a/multilib/lib32-gmp/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: josephgbr <rafael.f.f1@gmail.com>
-
-_pkgbasename=gmp
-pkgname=lib32-$_pkgbasename
-pkgver=5.0.2
-pkgrel=6
-pkgdesc="A free library for arbitrary precision arithmetic (32-bit)"
-arch=('x86_64')
-url="http://gmplib.org/"
-depends=('lib32-gcc-libs' $_pkgbasename)
-makedepends=(gcc-multilib)
-license=('LGPL3')
-options=(!libtool)
-source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2
-        538dfce27f41.patch)
-md5sums=('0bbaedc82fb30315b06b1588b9077cd3'
-         'a769be9c41618ca9c35d83375e7097d0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i $srcdir/538dfce27f41.patch
-
-  export ABI=32
-  ./configure \
-    --prefix=/usr --infodir=/usr/share/info \
-    --enable-cxx --libdir=/usr/lib32 \
-    --includedir=/usr/lib32/gmp
-
-  #Put gmp.h in the same folder as gmpxx.h
-  sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile
-
-  make
-}
-
-check() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD
deleted file mode 100644
index 7cc6e57ca..000000000
--- a/multilib/lib32-gnutls/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Christoph Vigano <mail at cvigano dot de>
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-_pkgbasename=gnutls
-pkgname=lib32-$_pkgbasename
-pkgver=3.0.12
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)"
-arch=('x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-options=('!libtool' '!makeflags')
-depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit' $_pkgbasename)
-makedepends=('gcc-multilib' 'lib32-libidn')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz)
-md5sums=('685fe5c00786c04b39e9aac362fa0cac')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  # build fails without --disable-hardware-acceleration because of assembler errors
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --with-zlib \
-    --disable-static \
-    --disable-guile \
-    --disable-valgrind-tests --disable-hardware-acceleration
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  find $pkgdir
-
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-gtk/PKGBUILD b/multilib/lib32-gtk/PKGBUILD
deleted file mode 100644
index 3ae2ae7ff..000000000
--- a/multilib/lib32-gtk/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 55430 2011-09-12 10:13:10Z pschmitz $
-
-_pkgbasename=gtk
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.10
-pkgrel=12
-pkgdesc="The GTK+ toolkit (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('lib32-libxi' 'lib32-glib' "${_pkgbasename}")
-makedepends=('gcc-multilib' 'lib32-libxt')
-options=('!libtool')
-source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz"
-        'aclocal-fixes.patch')
-md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20'
-         'c59d4906602d99a7468f7334b6fc3b4e')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd ${srcdir}/gtk+-${pkgver}
-	patch -p0 -i ${srcdir}/aclocal-fixes.patch
-
-	./configure --prefix=/usr \
-		--libdir=/usr/lib32 \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=x86_64-unknown-linux-gnu \
-		--target=x86_64-unknown-linux-gnu \
-		--with-xinput=xfree
-	make
-}
-
-package() {
-	cd ${srcdir}/gtk+-${pkgver}
-	make DESTDIR=${pkgdir} install
-	rm -rf "${pkgdir}/"{usr/{share,include,bin},etc}
-}
diff --git a/multilib/lib32-gtk/aclocal-fixes.patch b/multilib/lib32-gtk/aclocal-fixes.patch
deleted file mode 100644
index dd2ffbd44..000000000
--- a/multilib/lib32-gtk/aclocal-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk.m4.orig	2006-03-05 13:18:09.000000000 +0000
-+++ gtk.m4	2006-03-05 13:18:20.000000000 +0000
-@@ -4,7 +4,7 @@
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
- dnl Get the cflags and libraries from the gtk-config script
- dnl
diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD
deleted file mode 100644
index cb2033694..000000000
--- a/multilib/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 62207 2012-01-18 10:47:25Z 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/lib32-gtk2/gtk-modules-32.patch b/multilib/lib32-gtk2/gtk-modules-32.patch
deleted file mode 100644
index a2530c3bf..000000000
--- a/multilib/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/lib32-gtk2/gtk2.install b/multilib/lib32-gtk2/gtk2.install
deleted file mode 100644
index 49f86f550..000000000
--- a/multilib/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/lib32-gtk2/xid-collision-debug.patch b/multilib/lib32-gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/multilib/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/lib32-jack/PKGBUILD b/multilib/lib32-jack/PKGBUILD
deleted file mode 100644
index 4b1f9b35c..000000000
--- a/multilib/lib32-jack/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 56009 2011-09-28 20:00:34Z bluewind $
-# Maintainer: tobias <tobias@archlinux.net>
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-_pkgbasename=jack
-pkgname=lib32-$_pkgbasename
-_longname=jack-audio-connection-kit
-pkgver=0.121.3
-pkgrel=1
-pkgdesc="A low-latency audio server (32-bit)"
-arch=('x86_64')
-license=('GPL' 'LGPL')
-depends=('lib32-glibc' "$_pkgbasename=$pkgver")
-makedepends=(gcc-multilib)
-url="http://jackaudio.org/"
-options=('!libtool')
-source=(http://jackaudio.org/downloads/${_longname}-${pkgver}.tar.gz)
-md5sums=('35f470f7422c37b33eb965033f7a42e8')
-
-build() {
-  cd ${srcdir}/${_longname}-${pkgver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make -C libjack
-}
-
-package() {
-  cd ${srcdir}/${_longname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install-pkgconfigDATA
-  make -C libjack DESTDIR=${pkgdir} install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-json-c/PKGBUILD b/multilib/lib32-json-c/PKGBUILD
deleted file mode 100644
index 07670938e..000000000
--- a/multilib/lib32-json-c/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: congyiwu <congyiwu AT gmail DOT com>
-
-_pkgbasename=json-c
-pkgname=lib32-$_pkgbasename
-pkgver=0.9
-pkgrel=1
-pkgdesc="A JSON implementation in C (32-bit)"
-url="http://oss.metaparadigm.com/json-c/"
-license=("MIT")
-arch=('x86_64')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib' 'libtool-multilib')
-source=(http://oss.metaparadigm.com/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('3a13d264528dcbaf3931b0cede24abae')
-options=(!libtool)
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir/usr/include"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-keyutils/PKGBUILD b/multilib/lib32-keyutils/PKGBUILD
deleted file mode 100644
index 4a840c87b..000000000
--- a/multilib/lib32-keyutils/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-_pkgbasename=keyutils
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.5
-pkgrel=1
-pkgdesc="Linux Key Management Utilities (32-bit)"
-arch=(x86_64)
-url="http://www.kernel.org"
-license=('GPL2' 'LGPL2.1')
-depends=(lib32-glibc $_pkgbasename)
-makedepends=(gcc-multilib)
-source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2)
-md5sums=('9e8ab5164bc8f84be148761cc89e9d6f')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  sed -i -e 's/^\(USR\)\?LIBDIR\s*:=.*$/\1LIBDIR=\/usr\/lib32/' Makefile
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,{s,}bin}
-}
diff --git a/multilib/lib32-kmod/PKGBUILD b/multilib/lib32-kmod/PKGBUILD
deleted file mode 100644
index 5f860b7b3..000000000
--- a/multilib/lib32-kmod/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146696 2012-01-16 19:19:14Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=lib32-kmod
-_pkgbasename=kmod
-pkgver=4
-pkgrel=1
-pkgdesc="Linux kernel module handling"
-arch=('x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
-license=('GPL2')
-depends=('lib32-glibc' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=("http://packages.profusion.mobi/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz")
-md5sums=('e14450a066a48accd0af1995b3c0232d')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure \
-    --libdir=/usr/lib32 \
-    --sysconfdir=/etc \
-    --disable-tools \
-    --with-rootprefix= \
-    --with-zlib
-
-  make
-}
-
-package() {
-  make -C "$_pkgbasename-$pkgver" DESTDIR="$pkgdir" install
-
-  # nuke manpages and headers
-  rm -rf "$pkgdir"/usr/{share,include,bin}
-}
-
-# vim: ft=sh syn=sh et
diff --git a/multilib/lib32-krb5/PKGBUILD b/multilib/lib32-krb5/PKGBUILD
deleted file mode 100644
index 1b70b9d2b..000000000
--- a/multilib/lib32-krb5/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $
-# Maintainer: Florian Pritz <flo@xinu.at>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-_pkgbasename=krb5
-pkgname=lib32-$_pkgbasename
-pkgver=1.9.2
-pkgrel=1
-pkgdesc="The Kerberos network authentication system (32-bit)"
-arch=('x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('lib32-e2fsprogs' 'lib32-libldap' lib32-keyutils $_pkgbasename)
-makedepends=('perl' gcc-multilib)
-provides=('lib32-heimdal')
-replaces=('lib32-heimdal')
-conflicts=('lib32-heimdal')
-source=(http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.9/${_pkgbasename}-${pkgver}-signed.tar
-krb5-1.9.1-2011-007.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
-          '31a130542e92b70c807b2dbe6f9b182dc14f5e9f')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
-   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
-
-   # Apply upstream patch to fix a null pointer dereference when processing TGS requests
-   # CVE-2011-1530
-   # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch
-
-   export CC="gcc -m32"
-   export CXX="g++ -m32"
-   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/krb5 \
-               --mandir=/usr/share/man \
-               --localstatedir=/var/lia \
-               --libdir=/usr/lib32 \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap
-
-   make
-}
-
-check() {
-   # We can't do this in the build directory.
-   cd "${srcdir}/${_pkgbasename}-${pkgver}"
-   make -C src check
-}
-
-package() {
-   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" install
-
-   rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-   mkdir -p "$pkgdir/usr/share/licenses"
-   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch b/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch
deleted file mode 100644
index f1ffdd4d1..000000000
--- a/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
-index f46cad3..102fbaa 100644
---- a/src/kdc/Makefile.in
-+++ b/src/kdc/Makefile.in
-@@ -67,6 +67,7 @@ check-unix:: rtest
-
- check-pytests::
-	$(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
-+	$(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
-
- install::
-	$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index c169c54..840a2ef 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -243,7 +243,8 @@ tgt_again:
-                     if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
-                         errcode = find_alternate_tgs(request, &server);
-                         firstpass = 0;
--                        goto tgt_again;
-+                        if (errcode == 0)
-+                            goto tgt_again;
-                     }
-                 }
-                 status = "UNKNOWN_SERVER";
-diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
-new file mode 100644
-index 0000000..1760bcd
---- /dev/null
-+++ b/src/kdc/t_emptytgt.py
-@@ -0,0 +1,8 @@
-+#!/usr/bin/python
-+from k5test import *
-+
-+realm = K5Realm(start_kadmind=False, create_host=False)
-+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
-+if 'not found in Kerberos database' not in output:
-+    fail('TGT lookup for empty realm failed in unexpected way')
-+success('Empty tgt lookup.')
diff --git a/multilib/lib32-lcms/PKGBUILD b/multilib/lib32-lcms/PKGBUILD
deleted file mode 100644
index 8d1c5279f..000000000
--- a/multilib/lib32-lcms/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 26566 2010-09-15 22:35:39Z bluewind $
-# Maintainer: Tobias Kieslich <neri@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-_pkgbasename=lcms
-pkgname=lib32-$_pkgbasename
-pkgver=1.19
-pkgrel=3
-pkgdesc="Lightweight color management development library/engine (32-bit)"
-arch=(x86_64)
-license=('custom')
-depends=('lib32-libtiff>=3.9.4' $_pkgbasename)
-makedepends=(gcc-multilib)
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('8af94611baf20d9646c7c2c285859818')
-
-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
-  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/lib32-libao/PKGBUILD b/multilib/lib32-libao/PKGBUILD
deleted file mode 100644
index 1feed2e8d..000000000
--- a/multilib/lib32-libao/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-_pkgbasename=libao
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="A cross-platform audio output library and plugins (32-bit)"
-url="http://www.xiph.org/ao/"
-arch=('x86_64')
-license=('GPL')
-depends=($_pkgbasename 'lib32-glibc' 'lib32-alsa-lib' 'lib32-libpulse')
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=("http://downloads.xiph.org/releases/ao/$_pkgbasename-$pkgver.tar.gz")
-md5sums=('2b2508c29bc97e4dc218fa162cf883c8')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make DESTDIR=$pkgdir/ install
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-}
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-libasyncns/PKGBUILD b/multilib/lib32-libasyncns/PKGBUILD
deleted file mode 100644
index 83a1aae24..000000000
--- a/multilib/lib32-libasyncns/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 26569 2010-09-15 22:36:05Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-_pkgbasename=libasyncns
-pkgname=lib32-$_pkgbasename
-pkgver=0.8
-pkgrel=5
-pkgdesc="A C library for Linux/Unix for executing name service queries asynchronously (32-bit)"
-arch=(x86_64)
-url="http://0pointer.de/lennart/projects/libasyncns"
-license=('LGPL')
-options=('!libtool')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib')
-source=(http://0pointer.de/lennart/projects/libasyncns/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('1f553d6ce1ad255bc83b3d8e9384f515')
-
-build() {
-  cd ${srcdir}/libasyncns-${pkgver}
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # Fix libdir
-  sed -i '/^libdir=/s:/lib:/lib32:' *.pc.in
-
-  ./configure --prefix=/usr --disable-lynx --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/libasyncns-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf "${pkgdir}"/usr/{include,share}
-}
diff --git a/multilib/lib32-libcanberra/PKGBUILD b/multilib/lib32-libcanberra/PKGBUILD
deleted file mode 100644
index 8b2bd102d..000000000
--- a/multilib/lib32-libcanberra/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 46313 2011-05-05 01:10:02Z 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=1
-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
-  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/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD
deleted file mode 100644
index 5f5c6ba46..000000000
--- a/multilib/lib32-libcap/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-#$Id: PKGBUILD 64614 2010-01-21 11:40:53Z allan $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-
-_pkgbasename=libcap
-pkgname=lib32-$_pkgbasename
-pkgver=2.22
-pkgrel=1
-pkgdesc="POSIX 1003.1e capabilities (32-bit)"
-arch=(x86_64)
-url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
-license=('GPL2')
-depends=('lib32-attr' $_pkgbasename)
-makedepends=('gcc-multilib')
-source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz{,.asc})
-md5sums=('b4896816b626bea445f0b3849bdd4077'
-         '9d0983e25e5a251d098507f9561d2b27')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  make -C libcap CC="gcc -m32" prefix=/usr lib=lib32 DESTDIR=${pkgdir} install
-  chmod 755 ${pkgdir}/usr/lib32/libcap.so.${pkgver}
-
-  rm -rf "${pkgdir}/usr/include"
-}
diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD
deleted file mode 100644
index 3d744f140..000000000
--- a/multilib/lib32-libcups/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 55132 2011-09-03 08:41:17Z bluewind $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.0
-pkgrel=1
-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/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD
deleted file mode 100644
index 60333e3f7..000000000
--- a/multilib/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 61866 2012-01-09 17:59:00Z 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/lib32-libdrm/git_fixes.diff b/multilib/lib32-libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/multilib/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/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 6ad4a48ee..000000000
--- a/multilib/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/lib32-libffi/PKGBUILD b/multilib/lib32-libffi/PKGBUILD
deleted file mode 100644
index 9d5ef76fa..000000000
--- a/multilib/lib32-libffi/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57969 2011-11-04 23:32:00Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=lib32-libffi
-pkgver=3.0.10
-pkgrel=3
-pkgdesc="A portable, high level programming interface to various calling conventions (32 bits version)"
-arch=('x86_64')
-license=('MIT')
-url="http://sourceware.org/libffi"
-depends=('lib32-glibc')
-options=('!libtool')
-source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('79390673f5d07a8fb342bc09b5055b6f')
-
-build() {
-  cd "${srcdir}/libffi-${pkgver}"
-
-  export CC="gcc -m32"
-
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --libexecdir=/usr/lib32
-
-  make
-}
-
-package() {
-  cd "${srcdir}/libffi-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
-  rm -r "${pkgdir}"/usr/share/{info,man}
-}
diff --git a/multilib/lib32-libgcrypt/PKGBUILD b/multilib/lib32-libgcrypt/PKGBUILD
deleted file mode 100644
index 784f095ef..000000000
--- a/multilib/lib32-libgcrypt/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 60260 2011-12-08 19:40:31Z bluewind $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-_pkgbasename=libgcrypt
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="a general purpose crypto library based on the code used (32-bit)"
-arch=(x86_64)
-url="http://www.gnupg.org"
-license=('LGPL')
-depends=('lib32-libgpg-error>=1.7' $_pkgbasename)
-makedepends=(gcc-multilib libtool-multilib)
-options=(!libtool)
-source=(ftp://ftp.gnupg.org/gcrypt/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
-  #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${_pkgbasename}-${pkgver}.tar.bz2
-)
-md5sums=('693f9c64d50c908bc4d6e01da3ff76d8')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  # Use 32-bit assembler
-  sed 's:path="amd64":path="i586 i386":' -i mpi/config.links
-
-  # keep static library for , needed for cryptsetup
-  ./configure --prefix=/usr --disable-padlock-support --libdir=/usr/lib32 --enable-shared
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-}
diff --git a/multilib/lib32-libglade/PKGBUILD b/multilib/lib32-libglade/PKGBUILD
deleted file mode 100644
index 029d31cc8..000000000
--- a/multilib/lib32-libglade/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: TryA <tryagainprod {at} gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libglade
-pkgname=lib32-libglade
-pkgver=2.6.4
-pkgrel=4
-pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-gtk2' 'lib32-libxml2' "${_pkgbasename}")
-makedepends=('python2' 'pkgconfig' 'gcc-multilib')
-options=('!libtool')
-source=("http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/2.6/${_pkgbasename}-${pkgver}.tar.bz2"
-        'libglade-2.0.1-nowarning.patch')
-url='http://www.gnome.org'
-md5sums=('d1776b40f4e166b5e9c107f1c8fe4139'
-         '4f879c0ce550004905aa0fb24f25c353')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd "${srcdir}/${_pkgbasename}-${pkgver}"
-	patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch"
-	PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgbasename}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rm -rf ${pkgdir}/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch b/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch
deleted file mode 100644
index fd071215f..000000000
--- a/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
-+++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
-@@ -639,9 +639,8 @@
- 		if (!strcmp (childinfo->properties[j].name, "label")) {
- 		    label = childinfo->properties[j].value;
- 		    break;
--		} else {
--		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
- 		}
-+		/* Ignore all other properties */
- 	    }
- 
- 	    if (label) {
-@@ -683,6 +682,7 @@
- 	    char *icon = NULL;
- 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
- 	    gboolean use_underline = FALSE;
-+	    gboolean sensitive = TRUE;
- 	    GtkWidget *iconw = NULL;
- 	    int j;
- 
-@@ -708,6 +708,8 @@
- 		    group_name = value;
- 		} else if (!strcmp (name, "new_group")) {
- 		    new_group = BOOL (value);
-+		} else if (!strcmp (name, "sensitive")) {
-+		    sensitive = BOOL (value);
- 		} else if (!strcmp (name, "visible")) {
- 		    /* ignore for now */
- 		} else if (!strcmp (name, "tooltip")) {
-@@ -785,6 +787,8 @@
- 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
- 					     TRUE);
- 	    }
-+	    
-+	    gtk_widget_set_sensitive (child, sensitive);
- 
- 	    glade_xml_set_common_params (xml, child, childinfo->child);
- 	} else {
diff --git a/multilib/lib32-libgpg-error/PKGBUILD b/multilib/lib32-libgpg-error/PKGBUILD
deleted file mode 100644
index b0d16156b..000000000
--- a/multilib/lib32-libgpg-error/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 60262 2011-12-08 19:42:28Z bluewind $
-# Maintainer: judd <jvinet@zeroflux.org>
-
-_pkgbasename=libgpg-error
-pkgname=lib32-$_pkgbasename
-pkgver=1.10
-pkgrel=1
-pkgdesc="Support library for libgcrypt (32-bit)"
-arch=(x86_64)
-url="http://www.gnupg.org"
-license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=(!libtool)
-source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${_pkgbasename}-${pkgver}.tar.bz2)
-  #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('736a03daa9dc5873047d4eb4a9c22a16')
-
-
-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
-  make
-}
-
-package() {
-  cd "${srcdir}"/${_pkgbasename}-${pkgver}
-  make DESTDIR="${pkgdir}/" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-libice/PKGBUILD b/multilib/lib32-libice/PKGBUILD
deleted file mode 100644
index 6e65dd044..000000000
--- a/multilib/lib32-libice/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 31526 2010-11-01 23:47:50Z heftig $
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libice
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.7
-pkgrel=1
-pkgdesc="X11 Inter-Client Exchange library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' 'xproto>=7.0.18' $_pkgbasename)
-makedepends=('pkgconfig' 'xtrans>=1.2.5' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
-license=('custom')
-sha1sums=('c7d0f4c5b0e999385445b8be1bc89aec4e5de71d')
-
-build() {
-  cd "${srcdir}/libICE-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32
-
-  make
-}
-
-package() {
-  cd "${srcdir}/libICE-${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/lib32-libidn/PKGBUILD b/multilib/lib32-libidn/PKGBUILD
deleted file mode 100644
index 2f08a81f9..000000000
--- a/multilib/lib32-libidn/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-_pkgbasename=libidn
-pkgname=lib32-$_pkgbasename
-pkgver=1.22
-pkgrel=2
-pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications (32 bit)"
-url="http://www.gnu.org/software/libidn/"
-arch=('x86_64')
-license=('GPL3' 'LGPL')
-depends=('lib32-glibc' "$_pkgbasename>=$pkgver")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://ftp.gnu.org/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('893a1df0cf3b28b72d248382eaeaca71')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib32 CC='gcc -m32'
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{bin,include,share}
-}
diff --git a/multilib/lib32-libjpeg-turbo/PKGBUILD b/multilib/lib32-libjpeg-turbo/PKGBUILD
deleted file mode 100644
index 09102ad96..000000000
--- a/multilib/lib32-libjpeg-turbo/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 48100 2011-05-28 16:27:44Z bluewind $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
-
-_pkgbasename=libjpeg-turbo
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)"
-arch=('x86_64')
-url="http://libjpeg-turbo.virtualgl.org/"
-license=('GPL' 'custom')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('nasm' gcc-multilib)
-provides=('lib32-libjpeg=8.0.2')
-conflicts=('lib32-libjpeg')
-replaces=('lib32-libjpeg')
-options=('!libtool')
-source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('03b9c1406c7bfdc204313c2917ce6962')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure
-  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libldap/PKGBUILD b/multilib/lib32-libldap/PKGBUILD
deleted file mode 100644
index 51138f076..000000000
--- a/multilib/lib32-libldap/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 61133 2011-12-22 08:04:24Z bluewind $
-# Maintainer:
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-_pkgbasename=libldap
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.28
-pkgrel=1
-pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://www.openldap.org/"
-depends=('lib32-openssl' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz"
-        'ntlm.patch')
-md5sums=('196023e552eeb259e048edcd61a9645b'
-         '4258ddbef923d1f29f2843bc050f8c56')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/openldap-${pkgver}
-
-  patch -Np1 -i ${srcdir}/ntlm.patch
-
-  ./configure --prefix=/usr \
-              --libexecdir=/usr/sbin \
-              --sysconfdir=/etc \
-	      --mandir=/usr/share/man \
-              --localstatedir=/var/lib/openldap \
-              --enable-crypt --enable-dynamic \
-              --with-threads --disable-wrappers \
-	      --disable-spasswd --without-cyrus-sasl \
-	      --disable-bdb --disable-hdb --libdir=/usr/lib32
-
-  cd include
-  make
-
-  cd ../libraries
-  make depend
-  make
-
-}
-
-package() {
-  cd ${srcdir}/openldap-${pkgver}
-
-  cd include
-  make DESTDIR=${pkgdir} install
-
-  cd ../libraries
-  make DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc"
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libldap/ntlm.patch b/multilib/lib32-libldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/multilib/lib32-libldap/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/multilib/lib32-libmikmod/PKGBUILD b/multilib/lib32-libmikmod/PKGBUILD
deleted file mode 100644
index 4f29981ef..000000000
--- a/multilib/lib32-libmikmod/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Jesse Juhani Jaara <jesse.jaara@gmail.com>
-
-pkgname=lib32-libmikmod
-pkgver=3.1.12
-pkgrel=5
-pkgdesc="A portable sound library"
-license=('GPL' 'LGPL')
-url="http://sourceforge.net/projects/mikmod/"
-arch=('x86_64')
-depends=('libmikmod' 'lib32-glibc')
-makedepends=('gcc-multilib')
-options=('!libtool')
-install=
-source=(http://downloads.sourceforge.net/mikmod/libmikmod-${pkgver}.tar.gz
-        libmikmod-3.1.12-64bit-fix.diff
-	libmikmod-3.1.12-exitcrash-fix.diff
-	libmikmod-3.1.12-loopingvolume-fix.diff
-	libmikmod-3.1.12-md_sngchn-fix.diff
-        libmikmod-CVE-2009-0179.patch)
-md5sums=('9f3c740298260d5f88981fc0d51f6f16'
-         'dc7ffd8d6d355e9d6ec671b7f2b2adc7'
-         '03a4f5bfcecddf5f515672d6d477b7f7'
-         'a837fd876cbd2ac27419b802504489db'
-         '076d39de19de36b880ed90297f1ee0d1'
-         'fa91f4bc17164be32bec0ea7a73f2aaa')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/libmikmod-$pkgver
-
-  # patches from sdl_mixer-1.2.11 source
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd $srcdir/libmikmod-$pkgver
-  make DESTDIR=$pkgdir install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
-
diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff
deleted file mode 100644
index cd7800881..000000000
--- a/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Date: Sun, 04 Jul 2004 11:53:23 +0200
-From: Josselin Mouette
-Subject: Re: sdl 64bit problem [PATCH]
-
-Le sam, 03/07/2004 � 18:20 +0200, Hans-Frieder Vogt a �crit :
-> Hi list,
->
-> I found the problem that lead to the distorted sound in tuxracer on AMD64. It
-> may have also been the cause for the other reported sound problems with SDL.
-> The problem is not in SDL, but in SDL-mixer.
-> There, music files (*.it, and probably others as well) are incorrectly read on
-> all 64 bit architectures but Alpha, due to an incorrect data type definition.
-> The attached patch should solve the problem for all 64 bit architectures on
-> Linux, since at least cpp defines _LP64 and __LP64__ for them.
-> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32
-> bits.
-> I am not sure whether the usage of _LP64 is also standard for the commercial
-> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the
-> 64 bit environment as well.
->
-> Josselin,
-> could you include this patch into your next debian packages?
-
-diff -ru libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in
---- libmikmod-3.1.12.orig/include/mikmod.h.in	2007-12-15 01:24:19.000000000 -0800
-+++ libmikmod-3.1.12/include/mikmod.h.in	2009-10-05 00:18:56.000000000 -0700
-@@ -85,7 +85,7 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
-diff -ru libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h
---- libmikmod-3.1.12.orig/include/mikmod_internals.h	2007-12-15 04:24:51.000000000 -0800
-+++ libmikmod-3.1.12/include/mikmod_internals.h	2009-10-05 00:19:15.000000000 -0700
-@@ -50,7 +50,7 @@
- /*========== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
- typedef long		SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff
deleted file mode 100644
index fe62892b5..000000000
--- a/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Date: 15 Apr 2002 11:01:19 +0200
-From: Guillaume Cottenceau <gc@mandrakesoft.com>
-
-Unfortunately, I should have double checked that the following
-fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me),
-was really in the CVS... it's not, as of stable 1.2.3 at least.
-Please include it, it fixes a segfault on exiting a program which
-disabled MOD music during its execution.
-
-diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c
---- libmikmod-3.1.12.orig/playercode/virtch_common.c	2007-12-15 01:26:53.000000000 -0800
-+++ libmikmod-3.1.12/playercode/virtch_common.c	2009-10-05 00:37:12.000000000 -0700
-@@ -347,7 +347,7 @@
- 
- void VC1_SampleUnload(SWORD handle)
- {
--	if (handle<MAXSAMPLEHANDLES) {
-+	if (Samples && handle<MAXSAMPLEHANDLES) {
- 		if (Samples[handle])
- 			free(Samples[handle]);
- 		Samples[handle]=NULL;
diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff
deleted file mode 100644
index f0ce70e34..000000000
--- a/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001
- * Fixed MOD music volume when looping
-
-diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c
---- libmikmod-3.1.12.orig/playercode/mplayer.c	2009-10-05 00:19:59.000000000 -0700
-+++ libmikmod-3.1.12/playercode/mplayer.c	2009-10-05 00:44:35.000000000 -0700
-@@ -3019,7 +3019,7 @@
- {
- 	MUTEX_LOCK(vars);
- 	if (pf)
--		pf->volume=(volume<0)?0:(volume>128)?128:volume;
-+		pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
- 	MUTEX_UNLOCK(vars);
- }
- 
diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff
deleted file mode 100644
index 45cc355ae..000000000
--- a/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff
+++ /dev/null
@@ -1,112 +0,0 @@
-This patch fixes "buffer overflow due to md_numchn - ID: 1630158"
-
-diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c
---- libmikmod-3.1.12.orig/playercode/mplayer.c	2007-12-15 01:26:28.000000000 -0800
-+++ libmikmod-3.1.12/playercode/mplayer.c	2009-10-04 23:48:36.000000000 -0700
-@@ -52,6 +52,8 @@
-    will wait */
- /*static*/ MODULE *pf = NULL;
- 
-+#define NUMVOICES(mod)	(md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
-+
- #define	HIGH_OCTAVE		2	/* number of above-range octaves */
- 
- static	UWORD oldperiods[OCTAVE*2]={
-@@ -248,14 +250,14 @@
- 	MP_VOICE *a;
- 	ULONG t,k,tvol,pp;
- 
--	for (t=0;t<md_sngchn;t++)
-+	for (t=0;t<NUMVOICES(mod);t++)
- 		if (((mod->voice[t].main.kick==KICK_ABSENT)||
- 			 (mod->voice[t].main.kick==KICK_ENV))&&
- 		   Voice_Stopped_internal(t))
- 			return t;
- 
- 	tvol=0xffffffUL;t=-1;a=mod->voice;
--	for (k=0;k<md_sngchn;k++,a++) {
-+	for (k=0;k<NUMVOICES(mod);k++,a++) {
- 		/* allow us to take over a nonexisting sample */
- 		if (!a->main.s)
- 			return k;
-@@ -2249,12 +2251,12 @@
- 
- 	switch (dat) {
- 	case 0x0: /* past note cut */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.fadevol=0;
- 		break;
- 	case 0x1: /* past note off */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a) {
- 				mod->voice[t].main.keyoff|=KEY_OFF;
- 				if ((!(mod->voice[t].venv.flg & EF_ON))||
-@@ -2263,7 +2265,7 @@
- 			}
- 		break;
- 	case 0x2: /* past note fade */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.keyoff|=KEY_FADE;
- 		break;
-@@ -2318,7 +2320,7 @@
- 	SAMPLE *s;
- 
- 	mod->totalchn=mod->realchn=0;
--	for (channel=0;channel<md_sngchn;channel++) {
-+	for (channel=0;channel<NUMVOICES(mod);channel++) {
- 		aout=&mod->voice[channel];
- 		i=aout->main.i;
- 		s=aout->main.s;
-@@ -2736,7 +2738,7 @@
- 			if (a->dct!=DCT_OFF) {
- 				int t;
- 
--				for (t=0;t<md_sngchn;t++)
-+				for (t=0;t<NUMVOICES(mod);t++)
- 					if ((!Voice_Stopped_internal(t))&&
- 					   (mod->voice[t].masterchn==channel)&&
- 					   (a->main.sample==mod->voice[t].main.sample)) {
-@@ -2978,6 +2980,11 @@
- 	if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE))))
- 		return 1;
- 
-+	/* mod->numvoices was used during loading to clamp md_sngchn.
-+	   After loading it's used to remember how big mod->voice is.
-+	*/
-+	mod->numvoices = md_sngchn;
-+
- 	Player_Init_internal(mod);
- 	return 0;
- }
-@@ -3086,7 +3093,7 @@
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3111,7 +3118,7 @@
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3138,7 +3145,7 @@
- 		pf->sngpos=pos;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
diff --git a/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch b/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch
deleted file mode 100644
index 0c47e6545..000000000
--- a/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
---- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
-@@ -622,7 +622,8 @@
- 				/* read the remainder of the header */
- 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
- 
--				if(_mm_eof(modreader)) {
-+				/* last instrument is at the end of file in version 0x0104 */
-+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
- 					free(nextwav);free(wh);
- 					nextwav=NULL;wh=NULL;
- 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
-diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
---- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
-@@ -450,10 +450,12 @@
- 	if (!l->Init || l->Init()) {
- 		_mm_rewind(modreader);
- 		ok = l->Load(curious);
--		/* propagate inflags=flags for in-module samples */
--		for (t = 0; t < of.numsmp; t++)
--			if (of.samples[t].inflags == 0)
--				of.samples[t].inflags = of.samples[t].flags;
-+		if (ok) {
-+			/* propagate inflags=flags for in-module samples */
-+			for (t = 0; t < of.numsmp; t++)
-+				if (of.samples[t].inflags == 0)
-+					of.samples[t].inflags = of.samples[t].flags;
-+		}
- 	} else
- 		ok = 0;
- 
diff --git a/multilib/lib32-libmng/PKGBUILD b/multilib/lib32-libmng/PKGBUILD
deleted file mode 100644
index 354ca8b16..000000000
--- a/multilib/lib32-libmng/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 58042 2011-11-05 19:32:02Z lcarlier $
-# Maintainer: Florian Pritz <flo@xssn.at>
-
-_pkgbasename=libmng
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.10
-pkgrel=6
-pkgdesc="A collection of routines used to create and manipulate MNG format graphics files (32-bit)"
-arch=('x86_64')
-url="http://www.libmng.com/"
-license=('custom')
-depends=('lib32-zlib' 'lib32-libjpeg>=8' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('a464ae7d679781beebdf7440d144b7bd')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/$_pkgbasename-$pkgver
-  ln -s makefiles/configure.in .
-  ln -s makefiles/Makefile.am .
-  autoreconf --force --install
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  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/lib32-libogg/PKGBUILD b/multilib/lib32-libogg/PKGBUILD
deleted file mode 100644
index 966a76789..000000000
--- a/multilib/lib32-libogg/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 60957 2011-12-19 19:09:59Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=libogg
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="Ogg bitstream and framing library (32-bit)"
-arch=('x86_64')
-url="http://www.xiph.org/ogg/"
-license=('BSD')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(http://downloads.xiph.org/releases/ogg/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('0a7eb40b86ac050db3a789ab65fe21c2')
-
-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
-    make
-}
-
-package() {
-    cd $srcdir/${_pkgbasename}-${pkgver}
-
-    make DESTDIR=$pkgdir install
-
-    rm -rf "$pkgdir"/usr/{share,bin}
-    find "$pkgdir"/usr/include/ogg -type f -not -name config_types.h -delete
-    mv "$pkgdir"/usr/include/ogg/config_types{,-32}.h
-    mkdir -p "$pkgdir/usr/share/licenses"
-    ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libpciaccess/PKGBUILD b/multilib/lib32-libpciaccess/PKGBUILD
deleted file mode 100644
index be80aab83..000000000
--- a/multilib/lib32-libpciaccess/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 58044 2011-11-05 19:35:56Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libpciaccess
-pkgname=lib32-${_pkgbasename}
-pkgver=0.12.1
-pkgrel=3
-pkgdesc="X11 PCI access library (32-bit"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' ${_pkgbasename})
-makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
-sha1sums=('4933bda545df37395e57ff6b4bd61e17a5431770')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib32
-  make
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/include
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD
deleted file mode 100644
index 8900a4465..000000000
--- a/multilib/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 55366 2011-09-10 11:13:13Z pschmitz $
-# 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.4.8
-_apngver=1.4.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=('2ce595d571f2b06a9403ed5bcfa4ecbd'
-         '4842a4cba3487a64084ca0a7417ff1c7')
-
-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"
-
-#  libtoolize --force --copy
-#  aclocal
-#  autoconf
-#  automake --add-missing
-
-  ./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/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD
deleted file mode 100644
index 2118ef01b..000000000
--- a/multilib/lib32-libpulse/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 62215 2012-01-18 10:54:20Z 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/lib32-libsamplerate/PKGBUILD b/multilib/lib32-libsamplerate/PKGBUILD
deleted file mode 100644
index 72a06a49e..000000000
--- a/multilib/lib32-libsamplerate/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 61682 2012-01-06 14:16:07Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=libsamplerate
-pkgname=lib32-$_pkgbasename
-pkgver=0.1.8
-pkgrel=1
-pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio (32-bit)"
-arch=('x86_64')
-url="http://www.mega-nerd.com/SRC/index.html"
-license=('GPL')
-depends=('lib32-libsndfile' $_pkgbasename)
-makedepedns=('gcc-multilib')
-options=('!libtool')
-source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz)
-md5sums=('1c7fb25191b4e6e3628d198a66a84f47')
-sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-libsm/PKGBUILD b/multilib/lib32-libsm/PKGBUILD
deleted file mode 100644
index 8a88d6e4e..000000000
--- a/multilib/lib32-libsm/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 31529 2010-11-01 23:52:46Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libsm
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="X11 Session Management library (32-bit)"
-arch=(x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libice' 'lib32-util-linux-ng' $_pkgbasename)
-makedepends=('xorg-util-macros' 'xtrans' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
-sha1sums=('f78bc72f0b3ec26cbf980f84f014422ba854544d')
-
-build() {
-  cd "${srcdir}/libSM-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libSM-${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/lib32-libsndfile/PKGBUILD b/multilib/lib32-libsndfile/PKGBUILD
deleted file mode 100644
index 9debdca3d..000000000
--- a/multilib/lib32-libsndfile/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 53155 2011-07-31 05:20:20Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=libsndfile
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.25
-pkgrel=1
-pkgdesc="A C library for reading and writing files containing sampled sound (32-bit)"
-arch=('x86_64')
-url="http://www.mega-nerd.com/libsndfile"
-license=('LGPL')
-depends=('lib32-flac' 'lib32-libvorbis' $_pkgbasename)
-makedepends=('lib32-alsa-lib' 'gcc-multilib')
-options=('!libtool')
-source=(http://www.mega-nerd.com/libsndfile/files/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('e2b7bb637e01022c7d20f95f9c3990a2')
-sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  export GETCONF="getconf -v POSIX_V7_ILP32_OFFBIG"
-  export GETCONF_DIR="/usr/lib32/getconf"
-
-  ./configure --prefix=/usr --disable-sqlite --libdir=/usr/lib32
-  make -C src
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make -C src DESTDIR="${pkgdir}" install
-  make DESTDIR="$pkgdir" install-pkgconfigDATA
-
-  rm -rf "$pkgdir/usr/include"
-}
diff --git a/multilib/lib32-libssh2/PKGBUILD b/multilib/lib32-libssh2/PKGBUILD
deleted file mode 100644
index 88ac921e1..000000000
--- a/multilib/lib32-libssh2/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Florian Pritz <flo@xssn.at>
-# $Id: PKGBUILD 60959 2011-12-19 19:12:57Z bluewind $
-# Contributor: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: ice-man <icemanf@gmail.com>
-
-_pkgbasename=libssh2
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (32-bit)"
-url="http://www.libssh2.org/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('lib32-openssl' $_pkgbasename)
-makedepends=('zlib' "gcc-multilib")
-options=('!libtool')
-source=("http://www.libssh2.org/download/${_pkgbasename}-${pkgver}.tar.gz")
-md5sums=('6425331899ccf1015f1ed79448cb4709')
-
-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
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libstdc++5/PKGBUILD b/multilib/lib32-libstdc++5/PKGBUILD
deleted file mode 100644
index 3d30a4b0e..000000000
--- a/multilib/lib32-libstdc++5/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 26620 2010-09-15 22:43:15Z bluewind $
-
-pkgname=lib32-libstdc++5
-pkgver=3.3.6
-pkgrel=5
-pkgdesc="Legacy GNU Standard C++ library version 3 (32 bit)"
-arch=(x86_64)
-url="http://gcc.gnu.org"
-license=('GPL' 'LGPL')
-depends=('lib32-gcc-libs')
-makedepends=('gcc-multilib' 'binutils-multilib')
-options=('!libtool' '!makeflags')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
-        gcc-3.4.3-no_multilib_amd64.patch)
-md5sums=('18c52e6fb8966b7700665dca289d077f'
-         '6b3d00b8d079805be1b895f7f6ce47a0'
-         'b2a96584f4cee72362695ba44c911c40')
-
-build(){
-  export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||')
-  export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||')
-  cd ${srcdir}/gcc-${pkgver}
-
-  patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch
-  # No fixincludes
-  sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  mkdir ../gcc-build
-  cd ../gcc-build
-  # We build the full multilib libstdc++5 here, no idea how to restrict
-  # the build process to the 32 bit version only.
-  ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
-      --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \
-      --enable-multilib
-  make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O"
-}
-
-package() {
-  cd ${srcdir}/gcc-build
-  make DESTDIR=${pkgdir} install-target-libstdc++-v3
-
-  # Only install the lib32 files
-  rm -rf ${pkgdir}/usr/{include,share,lib}
-  rm -f ${pkgdir}/usr/lib32/*.a
-  rm -f ${pkgdir}/usr/lib32/libstdc++.so
-}
diff --git a/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch b/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
deleted file mode 100644
index 6ba6694db..000000000
--- a/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/config/i386/t-linux64.orig	2003-06-28 00:19:59.000000000 +0000
-+++ gcc/config/i386/t-linux64	2003-06-28 00:20:07.000000000 +0000
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD
deleted file mode 100644
index 5385f25b6..000000000
--- a/multilib/lib32-libtiff/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 60337 2011-12-11 19:52:32Z bluewind $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-_pkgbasename=libtiff
-pkgname=lib32-$_pkgbasename
-pkgver=3.9.5
-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=('lib32-libgl' 'lib32-libxmu' 'lib32-libxi' gcc-multilib)
-options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-md5sums=('8fc7ce3b4e1d0cc8a319336967815084')
-sha1sums=('f40aab20fb2f609b5cbc1171c40b66a1445e3773')
-
-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
-}
-
-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/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch
deleted file mode 100644
index 435a84b53..000000000
--- a/multilib/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/lib32-libusb-compat/PKGBUILD b/multilib/lib32-libusb-compat/PKGBUILD
deleted file mode 100644
index d6d74d770..000000000
--- a/multilib/lib32-libusb-compat/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 58048 2011-11-05 19:41:45Z lcarlier $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-
-pkgname=lib32-libusb-compat
-pkgver=0.1.3
-pkgrel=2
-pkgdesc="Library to enable user space application programs to communicate with USB devices"
-arch=('x86_64')
-depends=('lib32-libusb' 'libusb-compat')
-makedepends=('gcc-multilib')
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/libusb-compat-$pkgver/libusb-compat-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb')
-
-build() {
-  cd ${srcdir}/libusb-compat-${pkgver}
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/libusb-compat-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{bin,include}
-}
diff --git a/multilib/lib32-libusb/PKGBUILD b/multilib/lib32-libusb/PKGBUILD
deleted file mode 100644
index 69498b604..000000000
--- a/multilib/lib32-libusb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 58046 2011-11-05 19:39:36Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=lib32-libusb
-pkgver=1.0.8
-pkgrel=2
-pkgdesc="Library to enable user space application programs to communicate with USB devices. (32-bit)"
-arch=('x86_64')
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-depends=('lib32-glibc' 'libusb')
-makedepends=('gcc-multilib')
-source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
-options=(!libtool)
-md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef')
-
-build() {
-  cd "${srcdir}/libusb-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-
-  make
-}
-
-package () {
-  cd "${srcdir}/libusb-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf ${pkgdir}/usr/include
-}
-
diff --git a/multilib/lib32-libvorbis/PKGBUILD b/multilib/lib32-libvorbis/PKGBUILD
deleted file mode 100644
index 6f0b9fb1d..000000000
--- a/multilib/lib32-libvorbis/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 33990 2010-11-30 15:16:40Z bluewind $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-_pkgbasename=libvorbis
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="Vorbis codec library (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://www.xiph.org/ogg/vorbis/"
-depends=('lib32-libogg' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(http://downloads.xiph.org/releases/vorbis/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('c870b9bd5858a0ecb5275c14486d9554')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  #-march=i686 optimizes too much, strip it out
-  CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
-  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/lib32-libx11/PKGBUILD b/multilib/lib32-libx11/PKGBUILD
deleted file mode 100644
index f5392d36d..000000000
--- a/multilib/lib32-libx11/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 55180 2011-09-05 08:14:08Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libx11
-pkgname=lib32-$_pkgbasename
-pkgver=1.4.4
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename)
-makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib')
-options=('!libtool')
-license=('custom:XFREE86')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha1sums=('2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90')
-
-build() {
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libX11-${pkgver}"
-  ./configure --prefix=/usr --disable-static --disable-xf86bigfont \
-      --libdir=/usr/lib32 --disable-specs
-  make
-  make check
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxau/PKGBUILD b/multilib/lib32-libxau/PKGBUILD
deleted file mode 100644
index 728804d46..000000000
--- a/multilib/lib32-libxau/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 26632 2010-09-15 22:44:58Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxau
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.6
-pkgrel=2
-pkgdesc="X11 authorisation library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('pkgconfig' 'xproto>=7.0.15' 'gcc-multilib')
-license=('custom')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2)
-sha1sums=('0e1ab449f98026e4599f6e0d7491810d36c8fe4d')
-
-build() {
-  cd "${srcdir}/libXau-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXau-${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/lib32-libxcb/PKGBUILD b/multilib/lib32-libxcb/PKGBUILD
deleted file mode 100644
index 8e68f1911..000000000
--- a/multilib/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62579 2012-01-21 16:17:25Z ibiru $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.7
-pkgrel=3
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.6' '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=('7540f0587907bce421914f0ddb813810cb2f36f8'
-          '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/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index f17de1b1d..000000000
--- a/multilib/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/lib32-libxcomposite/PKGBUILD b/multilib/lib32-libxcomposite/PKGBUILD
deleted file mode 100644
index 8eb4d24ab..000000000
--- a/multilib/lib32-libxcomposite/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 31532 2010-11-01 23:56:56Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxcomposite
-pkgname=lib32-$_pkgbasename
-pkgver=0.4.3
-pkgrel=1
-pkgdesc="X11 Composite extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxfixes' 'compositeproto' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=(!libtool)
-source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2)
-sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXcomposite-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXcomposite-${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/lib32-libxcursor/PKGBUILD b/multilib/lib32-libxcursor/PKGBUILD
deleted file mode 100644
index 75d09684a..000000000
--- a/multilib/lib32-libxcursor/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 60955 2011-12-19 19:05:52Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-_pkgbasename=libxcursor
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.12
-pkgrel=1
-pkgdesc="X cursor management library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxfixes' 'lib32-libxrender' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2)
-sha1sums=('f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXcursor-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXcursor-${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/lib32-libxdamage/PKGBUILD b/multilib/lib32-libxdamage/PKGBUILD
deleted file mode 100644
index 17e003925..000000000
--- a/multilib/lib32-libxdamage/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 26644 2010-09-15 22:46:36Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxdamage
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.3
-pkgrel=3
-pkgdesc="X11 damaged region extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxfixes>=4.0.4' $_pkgbasename)
-makedepends=('pkg-config' 'damageproto>=1.2.0' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2)
-sha1sums=('7d96e8de107fede16951cb47d5e147630fbc7dee')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXdamage-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXdamage-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install || return 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/lib32-libxdmcp/PKGBUILD b/multilib/lib32-libxdmcp/PKGBUILD
deleted file mode 100644
index 9f8ebf468..000000000
--- a/multilib/lib32-libxdmcp/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 35270 2010-12-18 01:18:05Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxdmcp
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="X11 Display Manager Control Protocol library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('xproto' 'lib32-glibc' $_pkgbasename)
-makedepends=('xorg-util-macros' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2)
-sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f')
-
-build() {
-  cd ${srcdir}/libXdmcp-${pkgver}
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-              --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/libXdmcp-${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/lib32-libxext/PKGBUILD b/multilib/lib32-libxext/PKGBUILD
deleted file mode 100644
index 00c6cb8e5..000000000
--- a/multilib/lib32-libxext/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 60953 2011-12-19 19:05:14Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxext
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="X11 miscellaneous extensions library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libx11' 'xextproto' $_pkgbasename)
-makedepends=('xorg-util-macros' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2)
-sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d')
-
-build() {
-  cd "${srcdir}/libXext-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXext-${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/lib32-libxfixes/PKGBUILD b/multilib/lib32-libxfixes/PKGBUILD
deleted file mode 100644
index 2e2e1553e..000000000
--- a/multilib/lib32-libxfixes/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 60948 2011-12-19 19:00:52Z bluewind $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxfixes
-pkgname=lib32-$_pkgbasename
-pkgver=5.0
-pkgrel=1
-pkgdesc="X11 miscellaneous 'fixes' extension library (32-bit)"
-arch=('x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libx11' $_pkgbasename)
-makedepends=('pkg-config' gcc-multilib )
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2)
-sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXfixes-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXfixes-${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/lib32-libxft/PKGBUILD b/multilib/lib32-libxft/PKGBUILD
deleted file mode 100644
index 6036674d0..000000000
--- a/multilib/lib32-libxft/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 31474 2010-10-31 22:37:35Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=libxft
-pkgname=lib32-$_pkgbasename
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="FreeType-based font drawing library for X (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-fontconfig' 'lib32-libxrender')
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2)
-sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/libXft-${pkgver}
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/libXft-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxi/PKGBUILD b/multilib/lib32-libxi/PKGBUILD
deleted file mode 100644
index c4ad68595..000000000
--- a/multilib/lib32-libxi/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 61219 2011-12-24 18:33:43Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxi
-pkgname=lib32-$_pkgbasename
-pkgver=1.4.5
-pkgrel=1
-pkgdesc="X11 Input extension library (32-bit)"
-arch=('x86_64')
-url="http://xorg.freedesktop.org"
-depends=('lib32-libxext' 'inputproto' $_pkgbasename)
-makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib)
-options=(!libtool)
-license=('custom')
-source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXi-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXi-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxinerama/PKGBUILD b/multilib/lib32-libxinerama/PKGBUILD
deleted file mode 100644
index ba7920554..000000000
--- a/multilib/lib32-libxinerama/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 31546 2010-11-02 00:05:46Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-_pkgbasename=libxinerama
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="X11 Xinerama extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxext' 'xineramaproto' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=(!libtool)
-source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2)
-sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXinerama-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXinerama-${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/lib32-libxml2/PKGBUILD b/multilib/lib32-libxml2/PKGBUILD
deleted file mode 100644
index 94cd5c9d8..000000000
--- a/multilib/lib32-libxml2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 33687 2010-11-27 15:36:04Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-_pkgbasename=libxml2
-pkgname=lib32-$_pkgbasename
-pkgver=2.7.8
-pkgrel=1
-pkgdesc="XML parsing library, version 2 (32-bit)"
-arch=(x86_64)
-license=('custom')
-depends=('lib32-zlib>=1.2.4' 'lib32-readline>=6.1' 'lib32-ncurses>=5.7' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-url="http://www.xmlsoft.org/"
-source=(ftp://ftp.xmlsoft.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz
-        shared_library_versionning.patch)
-md5sums=('8127a65e8c3b08856093099b52599c86'
-         '84aeb7c6db023eae044e95d9211dba53')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "${srcdir}/shared_library_versionning.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr --with-threads --with-history --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh"
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxml2/shared_library_versionning.patch b/multilib/lib32-libxml2/shared_library_versionning.patch
deleted file mode 100644
index a0b62bca9..000000000
--- a/multilib/lib32-libxml2/shared_library_versionning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 04 Nov 2010 20:53:14 +0000
-Subject: Reactivate the shared library versionning script
-
----
-diff --git a/configure.in b/configure.in
-index 59d0629..a1d2c89 100644
---- a/configure.in
-+++ b/configure.in
-@@ -84,7 +84,7 @@ else
-   esac
- fi
- AC_SUBST(VERSION_SCRIPT_FLAGS)
--AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
-+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
- 
- dnl
- dnl We process the AC_ARG_WITH first so that later we can modify
---
-cgit v0.8.3.1
diff --git a/multilib/lib32-libxmu/PKGBUILD b/multilib/lib32-libxmu/PKGBUILD
deleted file mode 100644
index 269d698d7..000000000
--- a/multilib/lib32-libxmu/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 35276 2010-12-18 01:22:30Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxmu
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="X11 miscellaneous micro-utility library (32-bit)"
-arch=('x86_64')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'lib32-libxt' $_pkgbasename)
-makedepends=('xorg-util-macros' 'gcc-multilib')
-license=('custom')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2)
-sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd')
-
-build() {
-  cd "${srcdir}/libXmu-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXmu-${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/lib32-libxrandr/PKGBUILD b/multilib/lib32-libxrandr/PKGBUILD
deleted file mode 100644
index 9f8e38ce7..000000000
--- a/multilib/lib32-libxrandr/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 60945 2011-12-19 18:58:48Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxrandr
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="X11 RandR extension library (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'lib32-libxrender' 'randrproto' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXrandr-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXrandr-${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/lib32-libxrender/PKGBUILD b/multilib/lib32-libxrender/PKGBUILD
deleted file mode 100644
index 67dcf1678..000000000
--- a/multilib/lib32-libxrender/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 26677 2010-09-15 22:51:11Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxrender
-pkgname=lib32-$_pkgbasename
-pkgver=0.9.6
-pkgrel=4
-pkgdesc="X Rendering Extension client library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libx11>=1.3.4' $_pkgbasename)
-makedepends=('pkgconfig' 'gcc-multilib' renderproto)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2)
-sha1sums=('65bd96dc17da6b064f95109da02d9c9d14cb06dc')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXrender-${pkgver}"
-  ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXrender-${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/lib32-libxss/PKGBUILD b/multilib/lib32-libxss/PKGBUILD
deleted file mode 100644
index b796a93a5..000000000
--- a/multilib/lib32-libxss/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 35282 2010-12-18 01:28:22Z heftig $
-# Maintainer: Florian Pritz <flo@xssn.at>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libxss
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="X11 Screen Saver extension library (32-bit)"
-arch=(x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'scrnsaverproto' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2)
-sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXScrnSaver-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXScrnSaver-${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/lib32-libxt/PKGBUILD b/multilib/lib32-libxt/PKGBUILD
deleted file mode 100644
index 8f592db58..000000000
--- a/multilib/lib32-libxt/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 45006 2011-04-14 08:11:26Z lcarlier $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxt
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="X11 toolkit intrinsics library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libsm' 'lib32-libx11' $_pkgbasename)
-makedepends=('xorg-util-macros' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2)
-sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5')
-
-build() {
-  cd "${srcdir}/libXt-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXt-${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/lib32-libxtst/PKGBUILD b/multilib/lib32-libxtst/PKGBUILD
deleted file mode 100644
index bbddb6c40..000000000
--- a/multilib/lib32-libxtst/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 35285 2010-12-18 01:30:43Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxtst
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="X11 Testing -- Resource extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxext' 'lib32-libxi' 'recordproto' 'inputproto' $_pkgbasename)
-makedepends=('gcc-multilib' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2)
-sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72')
-
-build() {
-  cd "${srcdir}/libXtst-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --disable-static \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXtst-${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/lib32-libxv/PKGBUILD b/multilib/lib32-libxv/PKGBUILD
deleted file mode 100644
index 317fe2281..000000000
--- a/multilib/lib32-libxv/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 35288 2010-12-18 01:31:33Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxv
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.6
-pkgrel=1
-pkgdesc="X11 Video extension library (32-bit)"
-arch=(x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'videoproto' $_pkgbasename)
-makedepends=('pkgconfig' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2)
-sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${startdir}/src/libXv-${pkgver}
-  ./configure --prefix=/usr --disable-static \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${startdir}/src/libXv-${pkgver}
-
-  make DESTDIR=${startdir}/pkg 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/lib32-libxvmc/PKGBUILD b/multilib/lib32-libxvmc/PKGBUILD
deleted file mode 100644
index 539b563f2..000000000
--- a/multilib/lib32-libxvmc/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 26695 2010-09-15 22:53:40Z bluewind $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxvmc
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.6
-pkgrel=3
-pkgdesc="X11 Video Motion Compensation extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxv>=1.0.5' $_pkgbasename)
-makedepends=('pkgconfig' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2)
-sha1sums=('4ace7e7ce6b646b5715b2efa561affc89bc87f91')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/libXvMC-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/libXvMC-${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/lib32-libxxf86vm/PKGBUILD b/multilib/lib32-libxxf86vm/PKGBUILD
deleted file mode 100644
index e455615c8..000000000
--- a/multilib/lib32-libxxf86vm/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 35294 2010-12-18 01:34:58Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxxf86vm
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="X11 XFree86 video mode extension library (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'xf86vidmodeproto' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2)
-sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXxf86vm-${pkgver}"
-  ./configure --prefix=/usr --disable-static \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXxf86vm-${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/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD
deleted file mode 100644
index e7ff5c5ef..000000000
--- a/multilib/lib32-llvm/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 60966 2011-12-19 19:56:09Z lcarlier $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('lib32-llvm')
-pkgver=3.0
-pkgrel=1
-arch=('x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('lib32-libffi' 'python2' 'gcc-multilib')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz
-        http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz
-        clang-plugin-loader-registry.patch)
-sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477'
-            'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d'
-            'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c')
-
-build() {
-  cd "$srcdir/llvm-$pkgver.src"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # Fix symbolic links from OCaml bindings to LLVM libraries
-  sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
-
-  # Fix installation directories, ./configure doesn't seem to set them right
-  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
-         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \
-         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
-    Makefile.config.in
-
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Get the correct list of symbols to export
-  # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
-  patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  _cxx_headers="/usr/include/c++/clang-$pkgver"
-
-  _32bit_headers=""
-  if [[ $CARCH == x86_64 ]]; then
-    # Important for multilib
-    _32bit_headers="32"
-  fi
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32/llvm \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-libffi \
-    --enable-targets=all \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-cxx-include-root=$_cxx_headers \
-    --with-cxx-include-arch=$CHOST \
-    --with-cxx-include-32bit-dir=$_32bit_headers \
-    --$_optimized_switch-optimized
-
-  make REQUIRES_RTTI=1
-}
-
-package() {
-  pkgdesc="Low Level Virtual Machine (32 bits version)"
-  depends=('perl' 'lib32-libffi' 'llvm')
-
-  cd "$srcdir/llvm-$pkgver.src"
-
-  # We move the clang directory out of the tree so it won't get installed and
-  # then we bring it back in for the clang package
-  # mv tools/clang "$srcdir"
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib32/llvm/*.a
-
-  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  #sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-  sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config"
-  mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config"
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
-
-  # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
-
-  # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
-}
diff --git a/multilib/lib32-llvm/cindexer-clang-path.patch b/multilib/lib32-llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/multilib/lib32-llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-   
-   // We now have the CIndex directory, locate clang relative to it.
-   LibClangPath.eraseComponent();
-+  LibClangPath.eraseComponent();
- #endif
-   
-   LibClangPath.appendComponent("clang");
diff --git a/multilib/lib32-llvm/clang-plugin-loader-registry.patch b/multilib/lib32-llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/multilib/lib32-llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };
diff --git a/multilib/lib32-llvm/clang-pure64.patch b/multilib/lib32-llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa8b..000000000
--- a/multilib/lib32-llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::ppc64)
-       CmdArgs.push_back("/lib64/ld64.so.1");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
diff --git a/multilib/lib32-llvm/enable-lto.patch b/multilib/lib32-llvm/enable-lto.patch
deleted file mode 100644
index 3c8691b17..000000000
--- a/multilib/lib32-llvm/enable-lto.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1398,7 +1398,7 @@
-   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
-                          GCCInstallation.getTriple() + "/bin").str());
- 
--  Linker = GetProgramPath("ld");
-+  Linker = GetProgramPath("ld.gold");
- 
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
- 
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3412,11 +3412,11 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
-     CmdArgs.push_back("-plugin");
--    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-+    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
-     CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
- 
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/multilib/lib32-llvm/fix-gold-lto-linking.patch b/multilib/lib32-llvm/fix-gold-lto-linking.patch
deleted file mode 100644
index 84d166471..000000000
--- a/multilib/lib32-llvm/fix-gold-lto-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile
---- llvm-3.0.src.orig/tools/gold/Makefile	2011-05-31 23:00:45.000000000 +0300
-+++ llvm-3.0.src/tools/gold/Makefile	2011-12-04 22:06:59.000000000 +0200
-@@ -26,6 +26,6 @@ LINK_COMPONENTS := support
- # Because off_t is used in the public API, the largefile parts are required for
- # ABI compatibility.
- CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
-+CXXFLAGS+=-L $(SharedLibDir) -lLTO
- 
- include $(LEVEL)/Makefile.common
diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
deleted file mode 100644
index b88939af8..000000000
--- a/multilib/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,267 +0,0 @@
-# $Id: PKGBUILD 60968 2011-12-19 20:44:35Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri'
-  'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri')
-# prepare 7.12/8.0
-# pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    #pkgver=7.10.99.git20110709
-    pkgver=7.11
-  else
-    pkgver=7.11.2
-fi
-
-pkgrel=2
-arch=('x86_64')
-makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3'
-  'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm' 'namcap')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-if [ "${_git}" = "true" ]; then
-  # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
-  #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
-  source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
-  md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd')
-else
-  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" fix-build-with-llvm-3.0.patch)
-  #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2")
-  md5sums=('0837c52698fe3252369c3fdb5195afcc' '73501728793dc895bfc80dfb3253d39e')
-fi
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/lib32/llvm/llvm-config
-
-  cd ${srcdir}/?esa-*
-
-  if [ "${_git}" = "false" ]; then
-    # fix building of mesa-7.11.2 with llvm-3.0
-    patch -Np1 -i ../fix-build-with-llvm-3.0.patch
-  fi
-
-  autoreconf -vfi
-
-  if [ "${_git}" = "true" ]; then
-     ./autogen.sh --prefix=/usr \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi \
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glut \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-32-bit \
-    --libdir=/usr/lib32
-    #  --enable-gallium-svga \
-  else
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi \
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glut \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-32-bit \
-    --libdir=/usr/lib32
-  fi
-
-  make
-}
-
-package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
-
-  bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"
-  ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-libglapi() {
-  depends=('lib32-glibc' 'libglapi')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib32"
-  bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgles() {
-  depends=('lib32-libglapi' 'libgles')
-  pkgdesc="Mesa GLES libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-package_lib32-libegl() {
-  depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
-  pkgdesc="Mesa libEGL libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/lib32/egl"
-  bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
-  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
-}
-
-package_lib32-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
-  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib32/libGL.so"*
-  rm -f "${pkgdir}/usr/lib32/libglapi.so"*
-  rm -f "${pkgdir}/usr/lib32/libGLESv"*
-  rm -f "${pkgdir}/usr/lib32/libEGL"*
-  rm -rf "${pkgdir}/usr/lib32/egl"
-  rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
-  rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  cd ${srcdir}/?esa-*/src/mesa/drivers/dri
-  # classic mesa drivers for radeon,r200
-  make -C radeon DESTDIR="${pkgdir}" install
-  make -C r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-unichrome-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
-}
-
-package_lib32-mach64-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
-  conflicts=('xf86-video-mach64<6.8.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-mga-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
-  conflicts=('xf86-video-mga<1.4.11')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
-}
-
-package_lib32-r128-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
-  conflicts=('xf86-video-r128<6.8.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-savage-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
-  conflicts=('xf86-video-savage<2.3.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
-}
-
-package_lib32-sis-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for SiS (32-bit)"
-  conflicts=('xf86-video-sis<0.10.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
-}
-
-package_lib32-tdfx-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
-  conflicts=('xf86-video-tdfx<1.4.3')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
-}
-
-package_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
-
diff --git a/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch b/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch
deleted file mode 100644
index ceb5aa129..000000000
--- a/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
-index 56c26f5..d477c40 100644
---- a/src/gallium/auxiliary/draw/draw_llvm.c
-+++ b/src/gallium/auxiliary/draw/draw_llvm.c
-@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *var);
-  * Create LLVM type for struct draw_jit_texture
-  */
- static LLVMTypeRef
--create_jit_texture_type(struct gallivm_state *gallivm)
-+create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name)
- {
-    LLVMTargetDataRef target = gallivm->target;
-    LLVMTypeRef texture_type;
-@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_state *gallivm)
-    elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = 
-       LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
- 
-+#if HAVE_LLVM >= 0x0300
-+   texture_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(texture_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    texture_type = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                           Elements(elem_types), 0);
- 
-+   LLVMAddTypeName(gallivm->module, struct_name, texture_type);
-+
-    /* Make sure the target's struct layout cache doesn't return
-     * stale/invalid data.
-     */
-    LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
- 
-    LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width,
-                           target, texture_type,
-@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_state *gallivm)
-  */
- static LLVMTypeRef
- create_jit_context_type(struct gallivm_state *gallivm,
--                        LLVMTypeRef texture_type)
-+                        LLVMTypeRef texture_type, const char *struct_name)
- {
-    LLVMTargetDataRef target = gallivm->target;
-    LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context);
-@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_state *gallivm,
-    elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */
-    elem_types[4] = LLVMArrayType(texture_type,
-                                  PIPE_MAX_VERTEX_SAMPLERS); /* textures */
--
-+#if HAVE_LLVM >= 0x0300
-+   context_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(context_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    context_type = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                           Elements(elem_types), 0);
-+   LLVMAddTypeName(gallivm->module, struct_name, context_type);
- 
-    LLVMInvalidateStructLayout(gallivm->target, context_type);
-+#endif
- 
-    LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants,
-                           target, context_type, 0);
-@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_state *gallivm,
-  * Create LLVM type for struct pipe_vertex_buffer
-  */
- static LLVMTypeRef
--create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
-+create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name)
- {
-    LLVMTargetDataRef target = gallivm->target;
-    LLVMTypeRef elem_types[3];
-@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
-    elem_types[1] = LLVMInt32TypeInContext(gallivm->context);
-    elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */
- 
-+#if HAVE_LLVM >= 0x0300
-+   vb_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(vb_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    vb_type = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                      Elements(elem_types), 0);
-+   LLVMAddTypeName(gallivm->module, struct_name, vb_type);
- 
-    LLVMInvalidateStructLayout(gallivm->target, vb_type);
-+#endif
- 
-    LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride,
-                           target, vb_type, 0);
-@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
-    elem_types[1]  = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
-    elem_types[2]  = LLVMArrayType(elem_types[1], data_elems);
- 
-+#if HAVE_LLVM >= 0x0300
-+   vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(vertex_header, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                            Elements(elem_types), 0);
-+   LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
- 
-    LLVMInvalidateStructLayout(gallivm->target, vertex_header);
-+#endif
- 
-    /* these are bit-fields and we can't take address of them
-       LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask,
-@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
-                           target, vertex_header,
-                           DRAW_JIT_VERTEX_DATA);
- 
--   LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
--
-    return vertex_header;
- }
- 
-@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm)
-    struct gallivm_state *gallivm = llvm->gallivm;
-    LLVMTypeRef texture_type, context_type, buffer_type, vb_type;
- 
--   texture_type = create_jit_texture_type(gallivm);
--   LLVMAddTypeName(gallivm->module, "texture", texture_type);
-+   texture_type = create_jit_texture_type(gallivm, "texture");
- 
--   context_type = create_jit_context_type(gallivm, texture_type);
--   LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type);
-+   context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context");
-    llvm->context_ptr_type = LLVMPointerType(context_type, 0);
- 
-    buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0);
--   LLVMAddTypeName(gallivm->module, "buffer", buffer_type);
-    llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0);
- 
--   vb_type = create_jit_vertex_buffer_type(gallivm);
--   LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type);
-+   vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer");
-    llvm->vb_ptr_type = LLVMPointerType(vb_type, 0);
- }
- 
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index 8636cd6..f44749d 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -27,17 +27,23 @@
- 
- #include <llvm-c/Core.h>
- #include <llvm/Target/TargetMachine.h>
--#include <llvm/Target/TargetRegistry.h>
--#include <llvm/Target/TargetSelect.h>
- #include <llvm/Target/TargetInstrInfo.h>
- #include <llvm/Support/raw_ostream.h>
- #include <llvm/Support/MemoryObject.h>
- 
-+#if HAVE_LLVM >= 0x0300
-+#include <llvm/Support/TargetRegistry.h>
-+#include <llvm/Support/TargetSelect.h>
-+#else /* HAVE_LLVM < 0x0300 */
-+#include <llvm/Target/TargetRegistry.h>
-+#include <llvm/Target/TargetSelect.h>
-+#endif /* HAVE_LLVM < 0x0300 */
-+
- #if HAVE_LLVM >= 0x0209
- #include <llvm/Support/Host.h>
--#else
-+#else /* HAVE_LLVM < 0x0209 */
- #include <llvm/System/Host.h>
--#endif
-+#endif /* HAVE_LLVM < 0x0209 */
- 
- #if HAVE_LLVM >= 0x0207
- #include <llvm/MC/MCDisassembler.h>
-@@ -193,14 +199,23 @@ lp_disassemble(const void* func)
- 
-    InitializeAllDisassemblers();
- 
-+#if HAVE_LLVM >= 0x0300
-+   OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
-+#else
-    OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
-+#endif
- 
-    if (!AsmInfo) {
-       debug_printf("error: no assembly info for target %s\n", Triple.c_str());
-       return;
-    }
- 
-+#if HAVE_LLVM >= 0x0300
-+   const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), "");
-+   OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
-+#else 
-    OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
-+#endif 
-    if (!DisAsm) {
-       debug_printf("error: no disassembler for target %s\n", Triple.c_str());
-       return;
-@@ -213,7 +228,11 @@ lp_disassemble(const void* func)
- #else
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
--#if HAVE_LLVM >= 0x0208
-+
-+#if HAVE_LLVM >= 0x0300
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
-+#elif HAVE_LLVM >= 0x0208
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
- #else
-@@ -253,7 +272,11 @@ lp_disassemble(const void* func)
- 
-       if (!DisAsm->getInstruction(Inst, Size, memoryObject,
-                                  pc,
--                                 nulls())) {
-+#if HAVE_LLVM >= 0x0300
-+				  nulls(), nulls())) {
-+#else
-+				  nulls())) {
-+#endif
-          debug_printf("invalid\n");
-          pc += 1;
-       }
-@@ -276,7 +299,9 @@ lp_disassemble(const void* func)
-        * Print the instruction.
-        */
- 
--#if HAVE_LLVM >= 0x208
-+#if HAVE_LLVM >= 0x0300
-+      Printer->printInst(&Inst, Out, "");
-+#elif HAVE_LLVM >= 0x208
-       Printer->printInst(&Inst, Out);
- #else
-       Printer->printInst(&Inst);
-@@ -289,7 +314,11 @@ lp_disassemble(const void* func)
- 
-       pc += Size;
- 
-+#if HAVE_LLVM >= 0x0300
-+      const MCInstrDesc &TID = TII->get(Inst.getOpcode());
-+#else
-       const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
-+#endif
- 
-       /*
-        * Keep track of forward jumps to a nearby address.
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-index c5cf6d4..efd159f 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_type.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-@@ -325,16 +325,18 @@ lp_typekind_name(LLVMTypeKind t)
-       return "LLVMArrayTypeKind";
-    case LLVMPointerTypeKind:
-       return "LLVMPointerTypeKind";
-+#if HAVE_LLVM < 0x0300
-    case LLVMOpaqueTypeKind:
-       return "LLVMOpaqueTypeKind";
-+#endif
-    case LLVMVectorTypeKind:
-       return "LLVMVectorTypeKind";
-    case LLVMMetadataTypeKind:
-       return "LLVMMetadataTypeKind";
--   /* Only in LLVM 2.7 and later???
-+#if HAVE_LLVM == 0x0207
-    case LLVMUnionTypeKind:
-       return "LLVMUnionTypeKind";
--   */
-+#endif
-    default:
-       return "unknown LLVMTypeKind";
-    }
-diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c
-index 268f0fa..ce92a80 100644
---- a/src/gallium/drivers/llvmpipe/lp_jit.c
-+++ b/src/gallium/drivers/llvmpipe/lp_jit.c
-@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-       elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = 
-          LLVMArrayType(LLVMFloatTypeInContext(lc), 4);
- 
-+#if HAVE_LLVM >= 0x0300
-+   texture_type = LLVMStructCreateNamed(gallivm->context, "texture");
-+   LLVMStructSetBody(texture_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-       texture_type = LLVMStructTypeInContext(lc, elem_types,
-                                              Elements(elem_types), 0);
-+      LLVMAddTypeName(gallivm->module, "texture", texture_type);
- 
-       LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
- 
-       LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width,
-                              gallivm->target, texture_type,
-@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- 
-       LP_CHECK_STRUCT_SIZE(struct lp_jit_texture,
-                            gallivm->target, texture_type);
--
--      LLVMAddTypeName(gallivm->module, "texture", texture_type);
-    }
- 
-    /* struct lp_jit_context */
-@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-       elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type,
-                                                       PIPE_MAX_SAMPLERS);
- 
-+#if HAVE_LLVM >= 0x0300
-+   context_type = LLVMStructCreateNamed(gallivm->context, "context");
-+   LLVMStructSetBody(context_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-       context_type = LLVMStructTypeInContext(lc, elem_types,
-                                              Elements(elem_types), 0);
- 
-       LLVMInvalidateStructLayout(gallivm->target, context_type);
- 
-+      LLVMAddTypeName(gallivm->module, "context", context_type);
-+#endif
-+
-       LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants,
-                              gallivm->target, context_type,
-                              LP_JIT_CTX_CONSTANTS);
-@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-       LP_CHECK_STRUCT_SIZE(struct lp_jit_context,
-                            gallivm->target, context_type);
- 
--      LLVMAddTypeName(gallivm->module, "context", context_type);
--
-       lp->jit_context_ptr_type = LLVMPointerType(context_type, 0);
-    }
- 
diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD
deleted file mode 100644
index ea566be0d..000000000
--- a/multilib/lib32-mpg123/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 55271 2011-09-08 08:35:25Z bluewind $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-_pkgbasename=mpg123
-pkgname=lib32-$_pkgbasename
-pkgver=1.13.4
-pkgrel=1
-pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)"
-arch=('x86_64')
-url="http://sourceforge.net/projects/mpg123"
-license=('GPL2' 'LGPL2.1')
-depends=('lib32-glibc' 'lib32-libtool' 'lib32-alsa-lib' $_pkgbasename)
-makedepends=('lib32-sdl' gcc-multilib libtool-multilib)
-optdepends=('lib32-sdl: for additional audio support')
-options=('libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('073620b3938c4cb9c4f70e8fe3e114b8')
-sha1sums=('7fe195db9fe708c487a1d47a66e6e68d9b8e7a6e')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  
-  ./configure --prefix=/usr --with-audio="alsa sdl" --with-cpu=i586 --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-ncurses/PKGBUILD b/multilib/lib32-ncurses/PKGBUILD
deleted file mode 100644
index 31204d9c4..000000000
--- a/multilib/lib32-ncurses/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 56507 2011-10-07 13:54:05Z bluewind $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-_pkgbasename=ncurses
-pkgname=lib32-${_pkgbasename}
-pkgver=5.9
-pkgrel=1
-pkgdesc="System V Release 4.0 curses emulation library (32-bit)"
-arch=('x86_64')
-url="http://www.gnu.org/software/ncurses/"
-license=('MIT')
-depends=('lib32-glibc' ${_pkgbasename})
-makedepends=("gcc-multilib")
-source=(ftp://ftp.gnu.org/pub/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/
-  mkdir ncurses{,w}-build
-
-  cd ${srcdir}/ncursesw-build
-  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
-     --with-shared --with-normal --without-debug --without-ada \
-     --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32
-  make
-
-  # libncurses.so.5 for external binary support 
-  cd ${srcdir}/ncurses-build
-#  [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
-  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada \
-    --with-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/ncursesw-build
-  make install
-
-  install -dm755 ${pkgdir}/usr/lib32
-
-  # Fool packages looking to link to non-wide-character ncurses libraries
-  for lib in curses ncurses form panel menu; do
-    rm -f ${pkgdir}/usr/lib32/lib${lib}.so
-    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib32/lib${lib}.so
-    ln -sf lib${lib}w.a ${pkgdir}/usr/lib32/lib${lib}.a
-  done
-  ln -sf libncurses++w.a ${pkgdir}/usr/lib32/libncurses++.a
-
-  # Some packages look for -lcurses during build
-  rm -f ${pkgdir}/usr/lib32/libcursesw.so
-  echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib32/libcursesw.so
-  ln -sf libncurses.so ${pkgdir}/usr/lib32/libcurses.so
-  ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a
-  ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a
-
-  # non-widec compatibility library
-  cd ${srcdir}/ncurses-build        
-  install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.${pkgver}
-  ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.5
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-nettle/PKGBUILD b/multilib/lib32-nettle/PKGBUILD
deleted file mode 100644
index ebcc7f858..000000000
--- a/multilib/lib32-nettle/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Christoph Vigano <mail@cvigano.de>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: bender02 at gmx dot com
-
-_pkgbasename=nettle
-pkgname=lib32-$_pkgbasename
-pkgver=2.4
-pkgrel=3
-pkgdesc="A low-level cryptographic library (32-bit)"
-arch=('i686' 'x86_64')
-url="http://www.lysator.liu.se/~nisse/nettle/"
-license=('GPL2')
-depends=('lib32-gmp' $_pkgbasename)
-makedepends=(gcc-multilib)
-source=(ftp://ftp.gnu.org/gnu/nettle/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('450be8c4886d46c09f49f568ad6fa013')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-shared \
-    --disable-static # <-- seems not working now
-  make
-}
-
-check() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  find $pkgdir
-  
-  # remove static libs
-  rm -f ${pkgdir}/usr/lib32/{libhogweed,libnettle}.a
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-openal/PKGBUILD b/multilib/lib32-openal/PKGBUILD
deleted file mode 100644
index 6201cdf24..000000000
--- a/multilib/lib32-openal/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 42890 2011-03-22 08:03:47Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Jason Chu <jchu@xentac.net>
-
-_pkgbasename=openal
-pkgname=lib32-$_pkgbasename
-pkgver=1.13
-pkgrel=2
-pkgdesc="OpenAL audio library for use with opengl (32-bit)"
-arch=('x86_64')
-url="http://www.openal.org/"
-license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('lib32-alsa-lib' 'lib32-sdl' 'lib32-libpulse' 'pkgconfig' 'cmake' gcc-multilib)
-options=('!libtool')
-source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz2)
-md5sums=('58b7d2809790c70681b825644c5f3614')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/${_pkgbasename}-soft-${pkgver}/build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D LIB_SUFFIX=32 ..
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-soft-${pkgver}/build
-  make DESTDIR=${pkgdir}/ install 
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD
deleted file mode 100644
index ac6843135..000000000
--- a/multilib/lib32-openssl/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 62560 2012-01-21 10:57:52Z bluewind $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=openssl
-pkgname=lib32-$_pkgbasename
-_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 (32-bit)'
-arch=('x86_64')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=(lib32-zlib $_pkgbasename)
-optdepends=('ca-certificates' perl gcc-multilib)
-options=('!makeflags')
-source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
-        'no-rpath.patch'
-        'ca-dir.patch')
-md5sums=('07ecbe4324f140d157478637d6beccf1'
-         'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90')
-
-
-build() {
-  export CC="gcc -m32 -mstackrealign"
-  export CXX="g++ -m32 -mstackrealign"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/$_pkgbasename-$_ver
-
-  # 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 linux-elf --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
-    shared zlib enable-md2 -Wa,--noexecstack
-
-  make
-
-  # 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/$_pkgbasename-$_ver
-  make INSTALL_PREFIX=$pkgdir install
-  
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc"
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-openssl/ca-dir.patch b/multilib/lib32-openssl/ca-dir.patch
deleted file mode 100644
index 41d1386d3..000000000
--- a/multilib/lib32-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/multilib/lib32-openssl/no-rpath.patch b/multilib/lib32-openssl/no-rpath.patch
deleted file mode 100644
index ebd95e23d..000000000
--- a/multilib/lib32-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/multilib/lib32-p11-kit/PKGBUILD b/multilib/lib32-p11-kit/PKGBUILD
deleted file mode 100644
index b9963e719..000000000
--- a/multilib/lib32-p11-kit/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Christoph Vigano <mail@cvigano.de>
-
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.9
-pkgrel=3
-pkgdesc="Library to work with PKCS#11 modules (32-bit)"
-arch=(i686 x86_64)
-url="http://p11-glue.freedesktop.org"
-license=('BSD')
-depends=(lib32-glibc $_pkgbasename)
-options=(!libtool)
-source=($url/releases/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('029aa2a3a103e7eb81b4aa731b93539e')
-
-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 \
-    --with-module-path=/usr/lib32/pkcs11
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-pango/PKGBUILD b/multilib/lib32-pango/PKGBUILD
deleted file mode 100644
index d1236f4a4..000000000
--- a/multilib/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 62209 2012-01-18 10:47:32Z heftig $
-# 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=2
-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/lib32-pango/pango-modules-conffile.patch b/multilib/lib32-pango/pango-modules-conffile.patch
deleted file mode 100644
index a959cf1c8..000000000
--- a/multilib/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/lib32-pango/pango.install b/multilib/lib32-pango/pango.install
deleted file mode 100644
index 173b6820f..000000000
--- a/multilib/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/lib32-pcre/PKGBUILD b/multilib/lib32-pcre/PKGBUILD
deleted file mode 100644
index b798dc530..000000000
--- a/multilib/lib32-pcre/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 60943 2011-12-19 18:57:19Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=pcre
-pkgname=lib32-$_pkgbasename
-pkgver=8.21
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
-arch=('x86_64')
-url="http://pcre.sourceforge.net"
-license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('0a7b592bea64b7aa7f4011fc7171a730')
-
-build() {
-  cd "${srcdir}"/${_pkgbasename}-${pkgver}
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-utf8 --enable-unicode-properties
-  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/lib32-pixman/PKGBUILD b/multilib/lib32-pixman/PKGBUILD
deleted file mode 100644
index a064566ee..000000000
--- a/multilib/lib32-pixman/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 60941 2011-12-19 18:56:50Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=pixman
-pkgname=lib32-$_pkgbasename
-pkgver=0.24.0
-pkgrel=1
-pkgdesc="Pixman library (32-bit)"
-arch=('x86_64')
-url="http://xorg.freedesktop.org"
-license=('custom')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
-sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
-
-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 --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/include
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD
deleted file mode 100644
index df9d41c2e..000000000
--- a/multilib/lib32-qt/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 61795 2012-01-07 22:38:21Z 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=1
-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/lib32-readline/PKGBUILD b/multilib/lib32-readline/PKGBUILD
deleted file mode 100644
index 7ec1ea250..000000000
--- a/multilib/lib32-readline/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 60938 2011-12-19 18:55:02Z bluewind $
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-_pkgbasename=readline
-pkgname=lib32-$_pkgbasename
-_basever=6.2
-_patchlevel=002 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=1
-pkgdesc="GNU readline library (32-bit)"
-arch=(x86_64)
-url="http://tiswww.case.edu/php/chet/readline/rltop.html"
-license=('GPL')
-depends=('lib32-glibc' 'lib32-ncurses' $_pkgbasename)
-makedepends=('gcc-multilib')
-source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz)
-if [ $_patchlevel -gt 00 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-		source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
-    done
-fi
-md5sums=('67948acb2ca081f23359d0256e9a271c'
-         '83287d52a482f790dfb30ec0a8746669'
-         '8e6a51e2e0e6e45a82752e3692c111ac'
-         '0665020ea118e8434bd145fb71f452cc'
-         '285361ca6d48c51ae2428157e174e812')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-$_basever
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-	  msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-	  patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
-  done
-
-  # Remove RPATH from shared objects (FS#14366)
-  sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make SHLIB_LIBS=-lncurses
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-$_basever
-
-  make DESTDIR=${pkgdir} install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-sdl/PKGBUILD b/multilib/lib32-sdl/PKGBUILD
deleted file mode 100644
index a4520d40f..000000000
--- a/multilib/lib32-sdl/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 62690 2012-01-24 18:20:52Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-_pkgbasename=sdl
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.15
-pkgrel=1
-pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)"
-arch=('x86_64')
-url="http://www.libsdl.org"
-license=('LGPL')
-depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename)
-makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib)
-options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-        sdl-1.2.14-fix-mouse-clicking.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --libdir=/usr/lib32 --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
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-fix-mouse-clicking.patch b/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch
deleted file mode 100644
index 7d3e5acfc..000000000
--- a/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( this->input_grab == SDL_GRAB_OFF ) {
--			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-+			if ( this->input_grab == SDL_GRAB_OFF ) {
-+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+			}
-+			posted = SDL_PrivateMouseMotion(0, 0,
-+					xevent.xcrossing.x,
-+					xevent.xcrossing.y);
- 		}
--		posted = SDL_PrivateMouseMotion(0, 0,
--				xevent.xcrossing.x,
--				xevent.xcrossing.y);
- 	    }
- 	    break;
- 
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-sdl_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD
deleted file mode 100644
index bf60a1817..000000000
--- a/multilib/lib32-sdl_image/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62665 2012-01-23 18:29:11Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-_pkgbasename=sdl_image
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.12
-pkgrel=1
-pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)"
-arch=('x86_64')
-url="http://www.libsdl.org/projects/SDL_image/"
-license=('LGPL')
-depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
-md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
-
-build() {
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  cd ${srcdir}/SDL_image-${pkgver}
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL_image-${pkgver}
-
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/include
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/multilib/lib32-sdl_ttf/PKGBUILD b/multilib/lib32-sdl_ttf/PKGBUILD
deleted file mode 100644
index cffc2c0a6..000000000
--- a/multilib/lib32-sdl_ttf/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62239 2012-01-18 17:44:28Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Esa lakaniemi <esalaka@gmail.com>
-
-_pkgbasename=sdl_ttf
-pkgname=lib32-$_pkgbasename
-pkgver=2.0.11
-pkgrel=1
-pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)"
-arch=('x86_64')
-url="http://www.libsdl.org/projects/SDL_ttf/"
-license=('LGPL')
-options=('!libtool')
-depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
-makedepends=('gcc-multilib')
-source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
-md5sums=('61e29bd9da8d245bc2471d1b2ce591aa')
-
-build() {
-  cd "${srcdir}"/SDL_ttf-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib32 CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  make
-}
-
-package() {
-  cd "${srcdir}"/SDL_ttf-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf "${pkgdir}"/usr/include
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/multilib/lib32-speex/PKGBUILD b/multilib/lib32-speex/PKGBUILD
deleted file mode 100644
index d6f1ea20d..000000000
--- a/multilib/lib32-speex/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 26746 2010-09-15 23:03:23Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=speex
-pkgname=lib32-$_pkgbasename
-pkgver=1.2rc1
-pkgrel=3
-pkgdesc="A free codec for free speech (32-bit)"
-arch=(x86_64)
-license=('BSD')
-depends=('lib32-libogg' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(http://downloads.us.xiph.org/releases/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae')
-url="http://www.speex.org/"
-
-build() {
-  cd $srcdir/speex-$pkgver
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd $srcdir/speex-$pkgver
-  make DESTDIR=$pkgdir install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-sqlite3/PKGBUILD b/multilib/lib32-sqlite3/PKGBUILD
deleted file mode 100644
index 0b22d64ca..000000000
--- a/multilib/lib32-sqlite3/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-# Contributor: Kaos < gianlucaatlas dot gmail dot com >
-
-_pkgbasename=sqlite3
-pkgname=lib32-sqlite3
-_amalgamationver=3071000
-pkgver=3.7.10
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-depends=(lib32-glibc $_pkgbasename)
-makedepends=('tcl' 'gcc-multilib' 'lib32-readline')
-source=(http://www.sqlite.org/sqlite-src-${_amalgamationver}.zip)
-options=(!libtool)
-md5sums=('16da2e08ce2233556965cdf20d614bd9')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/sqlite-src-${_amalgamationver}
-  export LTLINK_EXTRAS="-ldl"
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-threadsafe \
-    --enable-threads-override-locks \
-    --enable-cross-thread-connections \
-    --disable-static --disable-tcl \
-    --enable-load-extension
-
-  # rpath removal
-  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-  make
-}
-
-
-package() {
-  cd ${srcdir}/sqlite-src-${_amalgamationver}
-  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/lib32-tdb/PKGBUILD b/multilib/lib32-tdb/PKGBUILD
deleted file mode 100644
index 0ef20e391..000000000
--- a/multilib/lib32-tdb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Florian Pritz <flo@xssn.at>
-
-_pkgbasename=tdb
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.9
-pkgrel=1
-pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits (32-bit)"
-arch=(x86_64)
-license=('GPL3')
-url="http://tdb.samba.org/"
-depends=(lib32-glibc $_pkgbasename)
-makedepends=(gcc-multilib libxslt python2)
-source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('4d97d18bbe9040038d4e003495bb8cd1')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-   cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-   sed -i -e 's#python#python2#g' buildtools/bin/waf
-
-   ./configure --prefix=/usr \
-               --localstatedir=/var \
-               --sysconfdir=/etc/samba \
-               --libdir=/usr/lib32 \
-               --disable-python
-   make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make -j1  DESTDIR="$pkgdir" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD
deleted file mode 100644
index a99efb154..000000000
--- a/multilib/lib32-udev/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62609 2012-01-22 19:02:33Z lcarlier $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=('lib32-udev')
-pkgver=178
-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=('173cc6061e3a82dd6e9a1a5cf767a858')
-
-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/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD
deleted file mode 100644
index cdd799467..000000000
--- a/multilib/lib32-util-linux/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 60379 2011-12-12 14:54:24Z dreisner $
-# Maintainer: judd <jvinet@zeroflux.org>
-
-_pkgbasename=util-linux
-pkgname=lib32-$_pkgbasename
-pkgver=2.20.1
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
-url="http://userweb.kernel.org/~kzak/util-linux-ng/"
-arch=('x86_64')
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-provides=('lib32-util-linux-ng')
-conflicts=('lib32-util-linux-ng')
-replaces=('lib32-util-linux-ng')
-license=('GPL2')
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.infradead.org/pub/$_pkgbasename/v2.20/$_pkgbasename-$pkgver.tar.bz2)
-md5sums=('079b37517fd4e002a2e6e992e8b4e361')
-
-shopt -s extglob
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./autogen.sh
-  ./configure --without-ncurses --libdir=/usr/lib32
-
-  for lib in lib{mount,blkid,uuid}; do
-    make -C "$lib"
-  done
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # remove everything but libs
-  rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32)
-}
diff --git a/multilib/lib32-v4l-utils/PKGBUILD b/multilib/lib32-v4l-utils/PKGBUILD
deleted file mode 100644
index b492b71f8..000000000
--- a/multilib/lib32-v4l-utils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 88966 2010-08-26 18:32:27Z thomas $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-_pkgbasename=v4l-utils
-pkgname=lib32-$_pkgbasename
-pkgver=0.8.5
-pkgrel=1
-pkgdesc="Userspace tools and conversion library for Video 4 Linux (32-bit)"
-arch=('x86_64')
-url="http://freshmeat.net/projects/libv4l"
-provides=("lib32-libv4l=$pkgver")
-replaces=('lib32-libv4l')
-conflicts=('lib32-libv4l')
-license=('LGPL')
-makedepends=('gcc-multilib')
-depends=('lib32-gcc-libs' $_pkgbasename lib32-libjpeg-turbo)
-source=(http://linuxtv.org/downloads/v4l-utils/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  make PREFIX=/usr LIBDIR=/usr/lib32
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make install PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR="${pkgdir}/"
-  rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,lib}
-}
diff --git a/multilib/lib32-xcb-util/PKGBUILD b/multilib/lib32-xcb-util/PKGBUILD
deleted file mode 100644
index fe1051772..000000000
--- a/multilib/lib32-xcb-util/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 60278 2011-12-08 20:24:48Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=xcb-util
-pkgname=lib32-xcb-util
-pkgver=0.3.8
-pkgrel=1
-pkgdesc="Utility libraries for XC Binding (32-bit)"
-arch=('x86_64')
-url="http://xcb.freedesktop.org"
-license=('custom')
-depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename)
-makedepends=('gperf' 'gcc-multilib')
-options=('!libtool')
-source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('8ce019c4bbf20dce246b98f177cfccff')
-
-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 --disable-static
-  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/lib32-zlib/PKGBUILD b/multilib/lib32-zlib/PKGBUILD
deleted file mode 100644
index a72223ae3..000000000
--- a/multilib/lib32-zlib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 35298 2010-12-18 01:45:49Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=zlib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.5
-pkgrel=6
-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)
-options=('!makeflags')
-source=("http://zlib.net/zlib-${pkgver}.tar.gz"
-        'zlib-1.2.5-lfs-decls.patch')
-md5sums=('c735eab2d659a96e5a594c9e8541ad63'
-         '4cb279ea3beab621f3526bf7b7ab99e5')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd ${srcdir}/zlib-$pkgver
-	# see http://bugs.archlinux.org/task/19280
-	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
-	# work around gcc bug; see https://bugs.archlinux.org/task/20647
-	export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
-	./configure --prefix=/usr \
-          --libdir=/usr/lib32
-	make
-	make check
-}
-
-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/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/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
deleted file mode 100644
index 22767d11a..000000000
--- a/multilib/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 62210 2012-01-18 10:47:35Z 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/libtool-multilib/libtool.install b/multilib/libtool-multilib/libtool.install
deleted file mode 100644
index 424c8cb88..000000000
--- a/multilib/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/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD
deleted file mode 100644
index d02b29590..000000000
--- a/multilib/nspluginwrapper/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 62211 2012-01-18 10:47:40Z 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/nspluginwrapper/fix_missing_lib.patch b/multilib/nspluginwrapper/fix_missing_lib.patch
deleted file mode 100644
index f239053f1..000000000
--- a/multilib/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/nspluginwrapper/install b/multilib/nspluginwrapper/install
deleted file mode 100644
index 78e196fdb..000000000
--- a/multilib/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/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD
deleted file mode 100644
index 0e1457979..000000000
--- a/multilib/q4wine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62212 2012-01-18 10:47:43Z 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/q4wine/q4wine.desktop b/multilib/q4wine/q4wine.desktop
deleted file mode 100644
index 2b1415848..000000000
--- a/multilib/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/wine/PKGBUILD b/multilib/wine/PKGBUILD
deleted file mode 100644
index 984abe030..000000000
--- a/multilib/wine/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 62213 2012-01-18 10:47:46Z heftig $
-# 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=1.1
-
-_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
-  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
-  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/wine/wine.install b/multilib/wine/wine.install
deleted file mode 100644
index 0548b7ffd..000000000
--- a/multilib/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/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD
deleted file mode 100644
index b9572f7cd..000000000
--- a/multilib/wine_gecko/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 58906 2011-11-20 00:25:05Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)
-# Contributor: Allan McRae (allan <at> archlinux <dot> org)
-# Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org)
-
-pkgname=wine_gecko
-pkgver=1.4
-pkgrel=1
-pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer"
-arch=(i686 x86_64)
-url="http://wiki.winehq.org/Gecko"
-license=(MPL)
-depends=('wine>=1.3.33')
-source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi)
-md5sums=('700aaa08724be1992cffed7b87e79a44'
-         '7b4811f667fd01d300fdff68420a9c72')
-
-if [[ $CARCH == i686 ]]; then
-  # Strip x86_64 msi
-  source=(${source[0]})
-  md5sums=(${md5sums[0]})
-fi
-
-package() {
-  cd "$srcdir"
-  _geckodir="$pkgdir/usr/share/wine/gecko"
-  install -Dm644 $pkgname-$pkgver-x86.msi "$_geckodir/$pkgname-$pkgver-x86.msi"
-  if [[ $CARCH == x86_64 ]]; then
-    install -m644 $pkgname-$pkgver-x86_64.msi "$_geckodir/"
-  fi
-}
diff --git a/social/batctl/PKGBUILD b/social/batctl/PKGBUILD
index b37c0f666..912011781 100644
--- a/social/batctl/PKGBUILD
+++ b/social/batctl/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=batctl
 pkgver=2011.3.0
 pkgrel=1
 pkgdesc="B.A.T.M.A.N. advanced control and management tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mesh.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index 29e68d0f3..5344ebed7 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -9,7 +9,7 @@ _pkgname=bitcoin
 pkgver=0.5.1
 pkgrel=1
 pkgdesc="Bitcoin is a peer-to-peer network based digital currency (daemon with JSON-RPC interface)."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bitcoin.org/"
 depends=('expat' 'boost-libs>=1.46' 'miniupnpc>=1.6' 'openssl')
 makedepends=('boost' 'gcc' 'make')
diff --git a/social/ffingerd/PKGBUILD b/social/ffingerd/PKGBUILD
index 4e312232b..dd87137ab 100644
--- a/social/ffingerd/PKGBUILD
+++ b/social/ffingerd/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=ffingerd
 pkgver=1.28
 pkgrel=2
 pkgdesc="Secure finger daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fefe.de/ffingerd/"
 license=('GPL2')
 depends=('glibc' 'xinetd')
diff --git a/social/haveged/PKGBUILD b/social/haveged/PKGBUILD
index b5f2e680a..74d53a602 100644
--- a/social/haveged/PKGBUILD
+++ b/social/haveged/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=haveged
 pkgver=1.1
 pkgrel=1
 pkgdesc="A simple entropy daemon."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.issihosts.com/haveged"
 license="GPL"
 source=(${url}/${pkgname}-${pkgver}.tar.gz
diff --git a/social/inadyn-opendns/PKGBUILD b/social/inadyn-opendns/PKGBUILD
index 75e8dc1ae..e75e25aca 100644
--- a/social/inadyn-opendns/PKGBUILD
+++ b/social/inadyn-opendns/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=inadyn-opendns
 pkgver=1.99
 pkgrel=3
 pkgdesc="Simple dynamic DNS client with SSL support"
-arch=('i686')
+arch=('i686' 'mips64el')
 url="http://www.opendns.com/account/dynamic_dns/downloads"
 license=('GPL')
 makedepends=('unzip')
diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD
index e3428763c..8d7c70484 100644
--- a/social/liblockfile/PKGBUILD
+++ b/social/liblockfile/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=liblockfile
 pkgver=1.08_4
 pkgrel=1
 pkgdesc="a library with NFS-safe locking functions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/unstable/libs/liblockfile1"
 depends=('glibc')
@@ -19,11 +19,12 @@ build() {
 	patch -p1 < ../debian/patches/$p
     done
 
-    ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-    make || return 1
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-static
+    sed -i "/ldconfig/d" Makefile
+    make
 
-    mkdir -p $startdir/pkg/usr/{lib,bin,include,share/man/man1,share/man/man3} 
-    make install prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man  || return 1
+    mkdir -p $pkgdir/usr/{lib,bin,include,share/man/man1,share/man/man3} 
+    make install prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man
 }
 
 md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e'
diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD
index ea43adfab..677b12f39 100644
--- a/social/libowfat/PKGBUILD
+++ b/social/libowfat/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libowfat
 pkgver=0.28
 pkgrel=4
 pkgdesc='GPL reimplementation of libdjb'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url=http://www.fefe.de/libowfat/
 depends=()
 license=(GPL)
diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD
index 57d833952..5e404c684 100644
--- a/social/lockfile-progs/PKGBUILD
+++ b/social/lockfile-progs/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=lockfile-progs
 pkgver=0.1.15
 pkgrel=1
 pkgdesc="programs for locking and unlocking files and mailboxes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://packages.debian.org/unstable/misc/lockfile-progs"
 depends=('glibc')
@@ -12,9 +12,11 @@ makedepends=('liblockfile')
 source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz)
 
 build() {
-    cd $startdir/src/sid
+    cd $srcdir/sid
 
-    make || return 1
+    [ "$CARCH" = "mips64el" ] && sed -i "s/-Werror//" Makefile
+
+    make
 
     mkdir -p $startdir/pkg/usr/bin
     install -s bin/* $startdir/pkg/usr/bin
diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD
index 4d139afdc..eb11f384b 100644
--- a/social/miniupnpc/PKGBUILD
+++ b/social/miniupnpc/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=miniupnpc
 pkgver=1.6
 pkgrel=2
 pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
 license=('BSD')
 depends=('sh')
diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD
index ba869598e..60e4d0b8e 100644
--- a/social/monkeysphere/PKGBUILD
+++ b/social/monkeysphere/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=monkeysphere
 pkgver=0.35
 pkgrel=2
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
 depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
diff --git a/social/olsrd/PKGBUILD b/social/olsrd/PKGBUILD
index dea029844..8fce985f6 100644
--- a/social/olsrd/PKGBUILD
+++ b/social/olsrd/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=olsrd
 pkgver="0.6.1"
 pkgrel=1
 pkgdesc="OLSR routing daemon (RFC 3626)"
-arch=(i686 x86_64 ppc)
+arch=(i686 x86_64 ppc mips64el)
 url="http://www.olsr.org"
 license=('BSD')
 depends=('glibc')
diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD
index f328607e7..fffb5d712 100644
--- a/social/opentracker/PKGBUILD
+++ b/social/opentracker/PKGBUILD
@@ -4,13 +4,13 @@ pkgname=opentracker
 pkgver=20111020
 pkgrel=1
 pkgdesc='An open and free bittorrent tracker (open mode)'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://erdgeist.org/arts/software/opentracker/'
 license=('custom:Beer' 'GPL')
 makedepends=('libowfat' 'cvs')
 depends=('bash' 'zlib')
 backup=('etc/opentracker/config')
-install=${pkgname}.install
+#install=${pkgname}.install
 source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
         'opentracker.rc.d'
         'license.txt')
diff --git a/social/tomoyo-tools/PKGBUILD b/social/tomoyo-tools/PKGBUILD
index aacd1dbe4..9ca0e3181 100644
--- a/social/tomoyo-tools/PKGBUILD
+++ b/social/tomoyo-tools/PKGBUILD
@@ -6,7 +6,7 @@ _timestamp=20110211
 pkgver=${_basever}.${_timestamp}
 pkgrel=4
 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://tomoyo.sourceforge.jp'
 license=('GPL')
 depends=('ncurses')
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/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/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 96ef60e83..000000000
--- a/staging/digikam/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 147663 2012-01-26 04:48:55Z eric $
-# 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=2
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
-             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	"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-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/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/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/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index ddb31c773..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.4
-pkgrel=6
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
-        'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl' 'qtwebkit')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
-sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
-          '9cb83cb7f6394549354c6837977f9e9529127041')
-
-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
-
-       patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.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/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/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/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/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/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 8829b6e70..000000000
--- a/staging/opencv/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 147051 2012-01-21 05:36:50Z 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/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/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/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/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/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/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 82e0d15fc..000000000
--- a/staging/transcode/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 147020 2012-01-20 20:01:07Z giovanni $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=2
-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)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./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/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 52303eec2..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 147135 2012-01-22 12:28:59Z giovanni $
-# 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=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  '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/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/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 4762c277c..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 147206 2012-01-24 17:51:49Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.24.0
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        fix-J-with-O-regression.patch
-        curlbuild.h)
-md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
-         '710242df6bc318d16eea611e7d1b1410'
-         'aa4539ec4f4a2dad1663dc22dd3ab0a1'
-         '751bd433ede935c8fae727377625a8ae')
-
-ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
-case $ptrsize in
-  8) _curlbuild=curlbuild-64.h ;;
-  4) _curlbuild=curlbuild-32.h ;;
-  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
-    exit 1
-    ;;
-esac
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-      --prefix=/usr \
-      --mandir=/usr/share/man \
-      --disable-dependency-tracking \
-      --disable-ldap \
-      --disable-ldaps \
-      --enable-ipv6 \
-      --enable-manual \
-      --enable-versioned-symbols \
-      --enable-threaded-resolver \
-      --without-libidn \
-      --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # devel
-  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
-  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/testing/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/testing/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/fontforge/PKGBUILD b/testing/fontforge/PKGBUILD
deleted file mode 100644
index aa91464c1..000000000
--- a/testing/fontforge/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 146646 2012-01-15 10:19:07Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=fontforge
-pkgver=20111214
-pkgrel=3
-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=('55c3f00c0b486492ba071fc479e1feb426562e2b')
-
-# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -i 's/python /python2 /g' Makefile.dynamic.in
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-type3 \
-		--enable-devicetables \
-		--enable-double \
-		--with-regular-link \
-		--with-python=python2 \
-		--enable-pyextension \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/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/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index 8b41189ca..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,260 +0,0 @@
-# $Id: PKGBUILD 147172 2012-01-23 21:35:31Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.2
-pkgrel=6
-_snapshot=4.6-20120120
-_libstdcppmanver=20111215		# Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64.patch
-	gcc-hash-style-both.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
-         '450772ce32daed97d7383199f8797f33'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '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
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -Np1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  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 \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libssp \
-      --enable-checking=release
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC"
-  groups=('base')
-  depends=('glibc>=2.14')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
-  groups=('base-devel')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-  # plugin headers are all over the place at the moment...
-  for i in common objc pragma pretty-print; do
-    ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
-  done
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
-  pkgdesc="Fortran front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
-  pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
-  pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
-  pkgdesc="Go front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/testing/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/testing/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/testing/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/testing/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/testing/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/testing/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/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/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD
deleted file mode 100644
index 5d51ffaf5..000000000
--- a/testing/java7-openjdk/PKGBUILD
+++ /dev/null
@@ -1,346 +0,0 @@
-# $Id: PKGBUILD 146368 2012-01-09 20:15:28Z 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=5
-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'
-             '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/archive
-#_url=http://icedtea.classpath.org/hg/icedtea7-forest/archive
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_url}/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
-        ${_url}/${_CORBA_CHANGESET}.tar.gz						# corba.tar.gz
-        ${_url}/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
-        ${_url}/${_JAXWS_CHANGESET}.tar.gz						# jaxws.tar.gz
-        ${_url}/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
-        ${_url}/${_LANGTOOLS_CHANGESET}.tar.gz						# langtools.tar.gz
-        ${_url}/${_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)
-
-#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")
-md5sums=('752721a037a625001fad7a5fc2013f60'
-         'ffb12013564794e9abbffbbbd0c58502'
-         '8f8d222d0a6d363d06b40576da5f1ea2'
-         '4abf34372e34cccd74ad337e487ed790'
-         'f2f40590a83889b8aa1d4631b705092d'
-         'd3beed0118bbd93d4651af762eb748c7'
-         'c8617700b4bd6cd5de1257bc36509bed'
-         'f10b711b0c784df8707808d9d0f52abd'
-         'ee1afda124d5927345014ab382ef581e'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'c195c4865b84d9e2e0fd71ac6d88eadb'
-         '203640d6e79e41b0065e016818c17ccd'
-         'b7b8996448c7b4fa7dd2d744488ed3bd'
-         'cdabafad0ec413d9a983888bf445a443'
-         '612b0fec7e0943c37a6de77c43622007'
-         '62443459da0cb28181feb260dc0e5ce7'
-         'a4293acadff03bdccbc9b412ad288549')
-
-  _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')
-  #  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
-
-  mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
-  # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
-  for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
-  done
-  popd
-  
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
-  # Install icons and menu entries
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
-    install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-                  ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
-  done
-  
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-}
-
-package_jdk7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
-  depends=('jre7-openjdk')
-  provides=('java-environment=7')
-  conflicts=('java-environment')
-  #  replaces=('openjdk6')
-  backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
-
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-
-  # Main files
-  install -m755 -d ${pkgdir}/${_jvmdir}/
-
-  cp -a demo include lib sample ${pkgdir}/${_jvmdir}
-
-  # 'bin' files
-  pushd bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
-                   ${pkgdir}/usr/bin/ \
-                   ${pkgdir}/usr/share/man/{,ja/}man1/
-
-  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
-  for b in $(ls | grep -v java-rmi.cgi); do
-    if [ -e ../jre/bin/${b} ]; then
-      # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
-    else
-      # Copy binary to jdk/bin/
-      install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
-      # Copy man page
-      install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
-      install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
-      # Link from /bin/
-      ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
-    fi
-  done
-  popd
-
-  # Handling 'java-rmi.cgi' separately
-  install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
-
-  # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
-  install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
-}
-
-package_openjdk7-src() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
-  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
-             ${pkgdir}/${_jvmdir}/src.zip
-}
diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/testing/java7-openjdk/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/testing/java7-openjdk/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/testing/java7-openjdk/glibc2_15.diff b/testing/java7-openjdk/glibc2_15.diff
deleted file mode 100644
index c2fd6124b..000000000
--- a/testing/java7-openjdk/glibc2_15.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -33,8 +33,6 @@
- #include "opto/subnode.hpp"
- 
- // Portions of code courtesy of Clifford Click
--
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
- 
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@ extern "C" {                            
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread 
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM 
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@ extern "C" {                            
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@ extern "C" {                            
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
-
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile
deleted file mode 100644
index 91265cc86..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh
deleted file mode 100644
index cc7dc8ab1..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
diff --git a/testing/java7-openjdk/jre7-openjdk-headless.install b/testing/java7-openjdk/jre7-openjdk-headless.install
deleted file mode 100644
index 45f52fe32..000000000
--- a/testing/java7-openjdk/jre7-openjdk-headless.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-}
-
-post_upgrade() {
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-}
-
-#post_remove() {
-#
-#}
diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install
deleted file mode 100644
index d98e79ec5..000000000
--- a/testing/java7-openjdk/jre7-openjdk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/jre.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile
deleted file mode 100644
index c86ce857a..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
-export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh
deleted file mode 100644
index a9aed27d1..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
deleted file mode 100644
index c68bd4441..000000000
--- a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-08-06 15:59:26.000000000 +0200
-@@ -91,10 +91,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -141,7 +141,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
deleted file mode 100644
index ba1a588e1..000000000
--- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2011-08-07 18:45:54.000000000 +0200
-@@ -102,7 +102,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -576,7 +577,7 @@
-     // TODO: according to wikipedia, compiz is now reparenting. This should
-     // probably be updated.
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -762,9 +763,17 @@
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -775,6 +784,8 @@
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1289,6 +1300,7 @@
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/testing/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-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
deleted file mode 100644
index b4f171fad..000000000
--- a/testing/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 147576 2012-01-25 23:16:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# 	not detected by namcap because libgl depends on it
-#	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
-         'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
-          'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
-           'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'e4198a443703f749b58a4fec88362fced1b45789'
-          '264e395c2c44cdda5a242c6dee649afab44cd6e5'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
-	cd "${srcdir}"/${_pkgname}-${pkgver}
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-	patch -p0 -i "${srcdir}"/fixpath.patch
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${_pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_Xmms=OFF \
-        -DWITH_Googlegadgets=OFF \
-        -DWITH_libgps=OFF \
-        -DWITH_OpenGLES=ON \
-        -DKWIN_BUILD_WITH_OPENGLES=ON \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
-	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
-	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
-	install -d -m755 "${pkgdir}"/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
-	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
-
-	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
-}
diff --git a/testing/kdebase-workspace/fixpath.patch b/testing/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/testing/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam
deleted file mode 100644
index dfedb8edf..000000000
--- a/testing/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		required	pam_nologin.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam
deleted file mode 100644
index 9ec074d06..000000000
--- a/testing/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
--session    optional    pam_systemd.so
diff --git a/testing/kdebase-workspace/kdebase-workspace.install b/testing/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/testing/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/kdebase-workspace/kdm b/testing/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/testing/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/kdebase-workspace/kdm-xinitrd.patch b/testing/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/testing/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+"  if [ -x \"$i\" ]; then\n"
-+"    . \"$i\"\n"
-+"  fi\n"
-+"  done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- "  for i in /etc/X11/Xresources/*; do\n"
- "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/testing/kdebase-workspace/kscreensaver.pam b/testing/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/testing/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/testing/kdebase-workspace/terminate-server.patch b/testing/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/testing/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/testing/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-okular/PKGBUILD b/testing/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 28bef76ae..000000000
--- a/testing/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 147568 2012-01-25 23:11:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-okular/kdegraphics-okular.install b/testing/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-strigi-analyzer/PKGBUILD b/testing/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 57ff195c6..000000000
--- a/testing/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 147626 2012-01-25 23:48:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.8.0
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/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/PKGBUILD b/testing/kmod/PKGBUILD
deleted file mode 100644
index 34983beaf..000000000
--- a/testing/kmod/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 146697 2012-01-16 19:19:27Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=4
-pkgrel=1
-pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
-license=('GPL2')
-depends=('glibc' 'zlib')
-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"
-        "depmod-search.conf")
-md5sums=('e14450a066a48accd0af1995b3c0232d'
-         '4b8cbcbc54b9029c99fd730e257d4436')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./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 b/testing/libreoffice/PKGBUILD
deleted file mode 100644
index ab256b844..000000000
--- a/testing/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,923 +0,0 @@
-# $Id: PKGBUILD 146343 2012-01-09 18:52:36Z stephane $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	#'libreoffice-extension-barcode' # 
-	'libreoffice-extension-diagram'
-	'libreoffice-extension-google-docs'
-	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-	'libreoffice-extension-nlpsolver'
-	'libreoffice-extension-ct2n'
-	'libreoffice-extension-numbertext'	
-	'libreoffice-extension-oooblogger'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
-	'libreoffice-extension-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-typo'
-	'libreoffice-extension-validator'
-	'libreoffice-extension-watch-window'
-	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.4.2
-pkgver=3.4.4
-pkgrel=5
-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"
-_additional_source_url="http://hg.services.openoffice.org/binaries"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_boost.diff
-	buildfix_ct2n.diff
-	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-	gcc462_buildfix.diff)
-noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
-         'db423cbb1cee416b718138044a5de930'
-         '31944d2139d6d81ef1131bd513530621'
-         'f447fd4ffe54aab9561c6caa262754b3'
-         '97fe698737a35c8803712d4e08007620'
-         'acff44d97a5106d9b53c747dabeb0800'
-         '620d43a0b9f36388f423e030513864ef'
-         '4c5b1ed870363eca2602f0cb42a8415a'
-         '702c6ca31525d7d2c2ded86c77b0bd2e'
-         'ac9b3acf78f43c1395d0e2dedc860f30'
-         'd8d2c41cb86bc8ba2a07e001a5317abb'
-         '4d4af2fc06dbe33ec2307df812f7abe1'
-         '1398a566eb76598bf3005e187fc2386c'
-         'dd962d2d57f88b9e07e665adad3cabbc'
-         'fff0fc9cd16ef1eb2b2ed5d0a6e77f95'
-         'e54d41d39e63d04ac4a88ce79e37af98'
-         'dbc71403040f447683bf55d1f0be3cad'
-         '69ce5b72f44b008d0e78767c5b1dbf39'
-         '34a2e8ae6b81a042966740263c53e135'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '185d60944ea767075d27247c3162b3bc'
-         '90401bca927835b6fbae4a707ed187c8'
-         '451ccf439a36a568653b024534669971'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '3c6c62e77c30649a3dfe73512947cc9a'
-         'eb35d4c715e0dfc23bbc706996033829'
-         '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-opengl\
-		--enable-ext-barcode \
-		--enable-ext-diagram \
-		--enable-ext-google-docs \
-		--enable-ext-hunart \
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-ext-nlpsolver \
-		--enable-ext-ct2n \
-		--enable-ext-numbertext \
-		--enable-ext-oooblogger \
-		--enable-ext-pdfimport \
-		--enable-ext-presenter-console \
-		--enable-ext-presenter-minimizer \
-		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-scripting-python \
-		--enable-ext-typo \
-		--enable-ext-validator \
-		--enable-ext-watch-window \
-		--enable-ext-wiki-publisher \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--with-system-libtextcat \
-		--with-external-libtextcat-data \
-		--with-openldap\
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mozilla\
-		--with-system-mythes\
-		--with-system-xrender-headers\
-		--with-system-headers\
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	unset MAKEFLAGS
-	./bootstrap
-	make
-	
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'libldap:          to get profiles via ldap'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/testing/libreoffice/PKGBUILD.next_stable b/testing/libreoffice/PKGBUILD.next_stable
deleted file mode 100644
index a25819863..000000000
--- a/testing/libreoffice/PKGBUILD.next_stable
+++ /dev/null
@@ -1,630 +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.2
-pkgver=3.5.0beta2
-pkgrel=2
-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}/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.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
-	fix_menuicons.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=c3569696294bb264a0c645db12f027d44b4e033f)
-noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.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=('e80d9d4b6c6b2a8be882a46bc8757e69'
-         '31471ad86996629a8c20f3a4d24ee03e'
-         '3146b8522605d24ce4a259fe73ec3519'
-         'a8b25a0bf696fd126a08319d88998492'
-         '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'
-         'f9bd737527dafd3eeb451cf0dd95d7d6')
-
-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}/fix_menuicons.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"\
-		--with-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--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
-#	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' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
diff --git a/testing/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/libreoffice/buildfix_boost.diff b/testing/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/testing/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
-          template <int MaxDigits>
-          inline bool allow_more_digits(std::size_t i)
-          {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+ 
-+ #include "boost/optional/optional_fwd.hpp"
-+ 
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ //   When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+ 
-+   public:
-+ 
-++    aligned_storage()
-++    {
-++      memset(&dummy_, 0, sizeof(dummy_));
-++    }
-++
-+     void const* address() const { return &dummy_.data[0]; }
-+     void      * address()       { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/testing/libreoffice/buildfix_ct2n.diff b/testing/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/testing/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
- ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
- ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/libreoffice/gcc462_buildfix.diff b/testing/libreoffice/gcc462_buildfix.diff
deleted file mode 100644
index c19e520dc..000000000
--- a/testing/libreoffice/gcc462_buildfix.diff
+++ /dev/null
@@ -1,138 +0,0 @@
---- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-15 15:08:41.329168423 -0200
-+++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-15 15:17:59.473190664 -0200
-@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
-     : ThreadHelpBase(&Application::GetSolarMutex())
- {
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
- }
- 
-@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
-     // SAFE -> ----------------------------------
-     WriteGuard aWriteLock(m_aLock);
-     
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
-     
-     aWriteLock.unlock();
---- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-15 15:08:15.771487938 -0200
-+++ ./framework/source/loadenv/loadenv.cxx	2011-12-15 15:19:06.038358483 -0200
-@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
-     // take over all new parameters.
-     m_xTargetFrame.clear();
-     m_xBaseFrame                    = xBaseFrame        ;
--    m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    m_lMediaDescriptor              =  tmp;
-     m_sTarget                       = sTarget           ;
-     m_nSearchFlags                  = nSearchFlags      ;
-     m_eFeature                      = eFeature          ;
---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig	2011-12-15 15:08:49.033072112 -0200
-+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx	2011-12-15 15:11:07.209344668 -0200
-@@ -175,6 +175,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig	2011-12-19 11:10:56.000000000 +0000
-+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx	2011-12-19 11:12:06.000000000 +0000
-@@ -185,6 +185,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+		UIElementType& operator=(const UIElementType& rRight) {
-+			bModified = rRight.bModified;
-+			bLoaded = rRight.bLoaded;
-+			bDefaultLayer = rRight.bDefaultLayer;
-+			nElementType = rRight.nElementType;
-+			aElementsHashMap = rRight.aElementsHashMap;
-+			xStorage = rRight.xStorage;
-+			return *this;
-+		};
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig	2011-12-19 11:14:17.000000000 +0000
-+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx	2011-12-19 11:15:16.000000000 +0000
-@@ -171,6 +171,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
-
---- ./padmin/source/prtsetup.cxx.orig	2011-12-15 15:09:05.133870823 -0200
-+++ ./padmin/source/prtsetup.cxx	2011-12-15 15:13:55.626239170 -0200
-@@ -813,7 +813,7 @@ extern "C" {
- 
-         if( aDialog.Execute() )
-         {
--            rJobData = aDialog.getSetup();
-+            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
-             nRet = 1;
-         }
- 
---- ./sfx2/source/doc/guisaveas.cxx.orig	2011-12-15 15:08:58.332955848 -0200
-+++ ./sfx2/source/doc/guisaveas.cxx	2011-12-15 15:12:39.953185212 -0200
-@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
-         if ( aFilterName.getLength() )
-             m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
- 
--        aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
-+        aFiltPropsHM <<  aFilterProps;
-         nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
-     }
- 
---- ./framework/inc/classes/filtercachedata.hxx.orig	2011-12-17 13:14:22.102898902 +0000
-+++ ./framework/inc/classes/filtercachedata.hxx	2011-12-17 13:17:51.524424012 +0000
-@@ -230,7 +230,7 @@
-         {
-             bPreferred			= rCopy.bPreferred		;
-             sName				= rCopy.sName			;
--            lUINames			= rCopy.lUINames		;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sMediaType			= rCopy.sMediaType		;
-             sClipboardFormat	= rCopy.sClipboardFormat;
-             nDocumentIconID		= rCopy.nDocumentIconID	;
-@@ -298,7 +298,7 @@
-             nOrder              = rCopy.nOrder              ;
-             sName				= rCopy.sName				;
-             sType				= rCopy.sType				;
--            lUINames			= rCopy.lUINames			;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sDocumentService	= rCopy.sDocumentService	;
-             sFilterService		= rCopy.sFilterService		;
-             sUIComponent        = rCopy.sUIComponent        ;
-@@ -405,7 +405,7 @@
-         inline Loader& impl_copy( const Loader& rCopy )
-         {
-             sName       = rCopy.sName       ;
--            lUINames	= rCopy.lUINames	;
-+            lUINames	= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             lTypes		= rCopy.lTypes		;
-             return (*this);
-         }
diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install
deleted file mode 100644
index cb0d393dd..000000000
--- a/testing/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/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff b/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
- 
- #define BIN_FILE_BODY \
--        UnixRights   = 555
-+        UnixRights   = 755
- 
- #define TXT_FILE_BODY \
--        UnixRights   = 444
-+        UnixRights   = 644
- 
- #define USER_FILE_BODY \
-         UnixRights   = 644
diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/testing/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
- 
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbaquerytable \
-         sc/source/ui/vba/vbarange \
-         sc/source/ui/vba/vbasheetobject \
--        sc/source/ui/vba/vbasheetobjects \
-         sc/source/ui/vba/vbastyle \
-         sc/source/ui/vba/vbastyles \
-         sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbawsfunction \
- ))
- 
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+        sc/source/ui/vba/vbasheetobjects \
-+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- 	$$(LDFLAGS) \
diff --git a/testing/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/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/opencv/PKGBUILD b/testing/opencv/PKGBUILD
deleted file mode 100644
index e0c769e07..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 146253 2012-01-07 05:13:32Z eric $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.3.1_a
-_realver=2.3.1
-pkgrel=3
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('opencv-docs'
-            'opencv-samples'
-            'eigen2'
-            'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
-md5sums=('82e4b6bfa349777233eea09b075e931e')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D BUILD_TESTS=OFF'
-            '-D ENABLE_SSE=ON'
-            '-D ENABLE_SSE2=ON'
-            '-D ENABLE_SSE3=OFF'
-            '-D ENABLE_SSSE3=OFF'
-            '-D ENABLE_SSE41=OFF'
-            '-D ENABLE_SSE42=OFF'
-            '-D BUILD_EXAMPLES=ON'
-            '-D INSTALL_C_EXAMPLES=ON'
-            '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
-
-build() {
-  cd "$srcdir/$_realname-$_realver"
-
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
-  cmake ${_cmakeopts[@]} .
-
-  make
-}
-
-package_opencv() {
-  cd "$srcdir/$_realname-$_realver"
-
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir/usr/share"
-
-  # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
-
-  # separate docs package; also be -R friendly
-  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  unset depends
-  unset optdepends
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=('bash')
-  unset optdepends
-  unset options
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/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/php/PKGBUILD b/testing/php/PKGBUILD
deleted file mode 100644
index 48accc59c..000000000
--- a/testing/php/PKGBUILD
+++ /dev/null
@@ -1,365 +0,0 @@
-# $Id: PKGBUILD 146355 2012-01-09 18:53:02Z stephane $
-# 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.8
-_suhosinver=5.3.7-0.9.10
-pkgrel=7
-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=('704cd414a0565d905e1074ffdc1fadfb'
-         '08582e502fed8221c6577042ca45ddb8'
-         '5bf4473f658404aa9a97bf026ecef8e9'
-         '65606c606df97a0760dfe5aaf9893afc'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'b01be5f816988fcee7e78225836e5e27'
-         '09005dabd90c48ddd392b3dbf05f8a82'
-         '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/testing/php/apache.conf b/testing/php/apache.conf
deleted file mode 100644
index c3ca0aad5..000000000
--- a/testing/php/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
-	<IfModule php5_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm
deleted file mode 100644
index 7a1ba2597..000000000
--- a/testing/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	postrotate
-	/etc/rc.d/php-fpm logrotate >/dev/null || true
-	endscript
-}
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
deleted file mode 100644
index b4dd32f96..000000000
--- a/testing/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
- 
- ; Error log file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -102,7 +102,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)
-@@ -121,9 +122,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
- 
- ; Unix user/group of processes
- ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -163,23 +164,23 @@
- ; The number of child processes created on startup.
- ; Note: Used only when pm is set to 'dynamic'
- ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
--;pm.start_servers = 20
-+pm.start_servers = 20
- 
- ; The desired minimum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.min_spare_servers = 5
-+pm.min_spare_servers = 5
- 
- ; The desired maximum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.max_spare_servers = 35
-+pm.max_spare_servers = 35
-  
- ; The number of requests each child process should execute before respawning.
- ; This can be useful to work around memory leaks in 3rd party libraries. For
- ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
- ; Default Value: 0
--;pm.max_requests = 500
-+pm.max_requests = 500
- 
- ; The URI to view the FPM status page. If this value is not set, no URI will be
- ; recognized as a status page. By default, the status page shows the following
-@@ -333,7 +334,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
deleted file mode 100644
index 46c842921..000000000
--- a/testing/php/php.ini.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- php.ini-production	2011-02-09 01:25:44.000000000 +0100
-+++ php.ini-production	2011-03-19 11:11:44.496987763 +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
-@@ -781,7 +781,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -804,7 +804,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"
- 
-@@ -938,53 +938,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 11g Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed. 
--; See http://www.php.net/manual/en/snmp.installation.php 
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+extension=json.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysqli.so
-+;extension=mysql.so
-+;extension=odbc.so
-+;extension=openssl.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sqlite.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+;extension=zip.so
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm
deleted file mode 100644
index 54bcf4d5b..000000000
--- a/testing/php/rc.d.php-fpm
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
-	try=0
-	while test $try -lt 35 ; do
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		stat_append '.'
-		try=`expr $try + 1`
-		sleep 1
-	done
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/php/php-fpm.conf ]; then
-		stat_append '(/etc/php/php-fpm.conf not found)'
-		stat_die
-	fi
-
-	local test=$(/usr/sbin/php-fpm -t 2>&1)
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/php/php-fpm.conf)'
-		stat_die
-	elif echo $test | grep -qi 'error'; then
-		stat_append '(error in /etc/php/php.ini)'
-		stat_die
-	fi
-
-	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			add_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	stop)
-		test_config
-		stat_busy 'Gracefully shutting down php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	force-quit)
-		stat_busy 'Terminating php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	restart)
-		$0 stop
-		$0 start
-	;;
-
-	reload)
-		test_config
-		stat_busy 'Reload service php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	logrotate)
-		stat_busy 'Reopen php-fpm log'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	*)
-		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
-		exit 1
-	;;
-
-esac
diff --git a/testing/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/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/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/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index 4e1d95a74..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 147240 2012-01-25 01:22:21Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=systemd
-pkgver=39
-pkgrel=1
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
-makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
-            'dbus-python: systemd-analyze'
-            'initscripts: legacy support for hostname and vconsole setup'
-            'initscripts-systemd: native boot and initialization scripts'
-            'python2-cairo: systemd-analyze'
-            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-options=('!libtool')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-        etc/dbus-1/system.d/org.freedesktop.login1.conf
-        etc/dbus-1/system.d/org.freedesktop.locale1.conf
-        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-        etc/systemd/system.conf
-        etc/systemd/user.conf
-        etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release")
-md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
-         '752636def0db3c03f121f8b4f44a63cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # Don't unset locale in getty
-  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
-  sed -i -e '/^Environ.*LANG/s/^/#/' \
-         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --libdir=/usr/lib \
-              --localstatedir=/var \
-              --with-rootprefix= \
-              --with-rootlibdir=/lib
-
-  make
-
-  # fix .so links in manpages
-  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
-  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  cd "$pkgdir/usr/share/man"
-
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/systemd/os-release b/testing/systemd/os-release
deleted file mode 100644
index 5e24a6031..000000000
--- a/testing/systemd/os-release
+++ /dev/null
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index f31642e13..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    systemctl daemon-reexec >/dev/null
-  fi
-
-  newpkgver=${1%-*}
-  oldpkgver=${2%-*}
-
-  # catch v31 need for restarting systemd-logind.service
-  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
-    # but only if systemd is running
-    if sd_booted; then
-      systemctl try-restart systemd-logind.service
-    fi
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/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 2a30f0dce..000000000
--- a/testing/udev/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 147236 2012-01-24 23:31:40Z 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=179
-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=('7d2880f66ea39146aae928f19ff3ca09')
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/xine-ui/PKGBUILD b/testing/xine-ui/PKGBUILD
deleted file mode 100644
index aae7761e5..000000000
--- a/testing/xine-ui/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 146259 2012-01-07 05:13:42Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-ui
-pkgver=0.99.6
-pkgrel=4
-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)
-sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
-          'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
-          '8bbd39f61de7b6991385457a4944b8ea104da88b'
-          '2361df9ddad59c426b0f863414c6d527b463a38a'
-          '9c70c6543dae6815710b239b4638ffe3843bac86')
-
-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"
-  sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
-  autoconf
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-x --enable-lirc --without-aalib --enable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install
-}
diff --git a/testing/xine-ui/fix_lirc.diff b/testing/xine-ui/fix_lirc.diff
deleted file mode 100644
index 93890cb5c..000000000
--- a/testing/xine-ui/fix_lirc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/m4/_xine.m4 b/m4/_xine.m4
---- a/m4/_xine.m4
-+++ b/m4/_xine.m4
-@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC],
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
-           AC_CHECK_FILE(["$llirc/liblirc_client.so"],
--             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             [LIRC_LIBS="$llirc/liblirc_client.so"
-+              found_lirc=yes]
-              AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-              AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-                 [LIRC_LIBS="$llirc/liblirc_client.a"
diff --git a/testing/xine-ui/lirc-check-a89347673097.patch b/testing/xine-ui/lirc-check-a89347673097.patch
deleted file mode 100644
index c1c8d2614..000000000
--- a/testing/xine-ui/lirc-check-a89347673097.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268754560 0
-# Node ID a89347673097053d89675e991ab403cda04d94cd
-# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11
-Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing.
-
---- a/m4/_xine.m4	Sun Mar 14 18:04:46 2010 +0000
-+++ b/m4/_xine.m4	Tue Mar 16 15:49:20 2010 +0000
-@@ -25,14 +25,14 @@
- dnl
- AC_DEFUN([AC_CHECK_LIRC],
-   [AC_ARG_ENABLE(lirc,
--     [  --disable-lirc          Turn off LIRC support.],
--     [], enable_lirc=yes)
-+     [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])],
-+     [given=Y], [given=N; enable_lirc=yes])
- 
-   found_lirc=no
-   if test x"$enable_lirc" = xyes; then
-     have_lirc=yes
--    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [])
--    if test "$LIRC_CFLAGS" != ''; then
-+    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:])
-+    if test "$found_lirc" = yes; then
-       LIRC_INCLUDE="$LIRC_CFLAGS"
-     else
-      AC_REQUIRE_CPP
-@@ -42,15 +42,20 @@
- 
-         if test x"$LIRC_PREFIX" != "x"; then
-            lirc_libprefix="$LIRC_PREFIX/lib"
--  	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-+	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
--          AC_CHECK_FILE(["$llirc/liblirc_client.a"],
--            [LIRC_LIBS="$llirc/liblirc_client.a"
--             found_lirc=yes],,)
-+          AC_CHECK_FILE(["$llirc/liblirc_client.so"],
-+             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-+             AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-+                [LIRC_LIBS="$llirc/liblirc_client.a"
-+                 found_lirc=yes],,)
-+          )
-         done
-      else
--         AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
-+	test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available])
-+	AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***])
-      fi
-     fi
-   fi
-@@ -59,7 +64,6 @@
-      fi
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
--     AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"])
- ])
- 
- dnl AC_C_ATTRIBUTE_ALIGNED
-
diff --git a/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch
deleted file mode 100644
index daad4f03a..000000000
--- a/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268758696 0
-# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514
-# Parent 882c464d4a650d09da37ade366face74452c1897
-Restore definition of HAVE_LIRC for use in makefiles.
-
---- a/m4/_xine.m4	Mon Mar 15 12:03:01 2010 -0700
-+++ b/m4/_xine.m4	Tue Mar 16 16:58:16 2010 +0000
-@@ -62,6 +62,7 @@
-      if test "$found_lirc" = yes; then
- 	AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed])
-      fi
-+     AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes])
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
- ])
-
diff --git a/testing/xine-ui/xine-ui-xdg.diff b/testing/xine-ui/xine-ui-xdg.diff
deleted file mode 100644
index 959d674b2..000000000
--- a/testing/xine-ui/xine-ui-xdg.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- xine-ui-0.99.6.orig/src/xitk/common.h
-+++ xine-ui-0.99.6/src/xitk/common.h
-@@ -331,6 +331,5 @@ typedef struct {
-   int                       use_root_window;
- 
-   int                       ssaver_enabled;
--  int                       ssaver_timeout;
- 
-   int                       skip_by_chapter;
---- xine-ui-0.99.6.orig/src/xitk/main.c
-+++ xine-ui-0.99.6/src/xitk/main.c
-@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
-   if (sigprocmask (SIG_BLOCK,  &vo_mask, NULL))
-     fprintf (stderr, "sigprocmask() failed.\n");
- 
-+  signal(SIGCHLD, SIG_IGN);
-+
-   gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
-   
-   gGui->stream                 = NULL;
---- xine-ui-0.99.6.orig/src/xitk/panel.c
-+++ xine-ui-0.99.6/src/xitk/panel.c
-@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
-  * Update slider thread.
-  */
- static void *slider_loop(void *dummy) {
--  int screensaver_timer = 0;
-   int status, speed;
-   int pos, secs;
-   int i = 0;
-@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
- 	else
- 	  video_window_set_mrl((char *)gGui->mmk.mrl);
- 	
--	if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
--	  
--	  if(gGui->ssaver_timeout) {
--	    
--	    if(!(i % 2))
--	      screensaver_timer++;
--	    
--	    if(screensaver_timer >= gGui->ssaver_timeout) {
--	      screensaver_timer = 0;
--	      video_window_reset_ssaver();
--	      
--	    }
--	  }  
--	}
-+       video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
- 
- 	if(gGui->logo_mode == 0) {
- 	  
-@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
- 	    stream_infos_update_infos();
- 
- 	}
-+      } else {
-+       video_window_suspend_ssaver(0);
-       }
-     }
-     
---- xine-ui-0.99.6.orig/src/xitk/videowin.c
-+++ xine-ui-0.99.6/src/xitk/videowin.c
-@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
- 
-   /* The old window should be destroyed now */
-   if(old_video_window != None) {
-+    /* Screensaver control is tied to our window id */
-+    video_window_suspend_ssaver(0);
-+
-     XDestroyWindow(gGui->video_display, old_video_window);
-      
-     if(gGui->cursor_grabbed)
-@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
- 
- }
- 
--void video_window_reset_ssaver(void) {
-+void video_window_suspend_ssaver(int do_suspend) {
-+  static int was_suspended;
- 
--  if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
-+  do_suspend = do_suspend && gGui->ssaver_enabled;
- 
--#ifdef HAVE_XTESTEXTENSION
--    if(gVw.have_xtest == True) {
--      
--      gVw.fake_key_cur++;
--      
--      if(gVw.fake_key_cur >= 2)
--	gVw.fake_key_cur = 0;
--
--      XLockDisplay(gGui->video_display);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
--      XSync(gGui->video_display, False);
--      XUnlockDisplay(gGui->video_display);
-+  if(was_suspended != do_suspend) {
-+    if(fork() == 0) {
-+      char window_id[30];
-+      char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
-+      int fd;
-+
-+      for(fd = 3; fd < 256; fd++)
-+	close(fd);
-+
-+      args[1] = do_suspend ? "suspend" : "resume";
-+      sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
-+      execvp(args[0], args);
-+      _exit(0);
-     }
--    else 
--#endif
--    {
--      /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
--      /* assuming its location and permission will not change during run time of xine-ui. */
--      {
--	static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
--	static char *gssaver_path   = NULL;
--
--	if(!gssaver_path) {
--	  char *path = getenv("PATH");
--
--	  if(!path)
--	    path = "/usr/local/bin:/usr/bin";
--	  do {
--	    char *p, *pbuf;
--	    int   plen;
--
--	    for(p = path; *path && *path != ':'; path++)
--	      ;
--	    if(p == path)
--	      plen = 1, p = ".";
--	    else
--	      plen = path - p;
--	    asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
--	    if ( access(pbuf, X_OK) ) {
--	      free(pbuf);
--	      gssaver_path = "";
--	    } else
--	      gssaver_path = pbuf;
--	  } while(!gssaver_path[0] && *path++);
--	}
--	if(gssaver_path[0] && (fork() == 0)) {
--	  execv(gssaver_path, gssaver_args);
--	  exit(0);
--	}
--      }
- 
--      XLockDisplay(gGui->video_display);
--      XResetScreenSaver(gGui->video_display);
--      XUnlockDisplay(gGui->video_display);
--    }
-+    was_suspended = do_suspend;
-   }
- }
- 
-+void video_window_reset_ssaver(void) {
-+  video_window_suspend_ssaver(1);
-+}
-+
- void video_window_get_frame_size(int *w, int *h) {
-   if(w)
-     *w = gVw.frame_width;
---- xine-ui-0.99.6.orig/src/xitk/videowin.h
-+++ xine-ui-0.99.6/src/xitk/videowin.h
-@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
- void video_window_update_logo(void);
- void video_window_change_skins(int);
- 
-+void video_window_suspend_ssaver(int do_suspend);
- void video_window_reset_ssaver(void);
- 
- void video_window_get_frame_size(int *w, int *h);
---- xine-ui-0.99.6.orig/src/xitk/event.c
-+++ xine-ui-0.99.6/src/xitk/event.c
-@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
-   gGui->skip_by_chapter = cfg->num_value;
-   panel_update_nextprev_tips();
- }
--static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
--  gGui->ssaver_timeout = cfg->num_value;
--}
- 
- static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
-   
-@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
- 					 snapshot_loc_cb,
- 					 CONFIG_NO_DATA);
-   
--  gGui->ssaver_timeout =
--    xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
--			      _("Screensaver reset interval (s)"),
--			      _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
--			      CONFIG_LEVEL_ADV,
--			      ssaver_timeout_cb,
--			      CONFIG_NO_DATA);
--  
-   gGui->skip_by_chapter = 
-     xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
- 			       _("Chapter hopping"),
-
-
-
-
- 
diff --git a/testing/xine-ui/xine-ui.install b/testing/xine-ui/xine-ui.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/testing/xine-ui/xine-ui.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/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
-}
diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD
index 2faf6acb3..1690daad9 100644
--- a/~fauno/distccd-zeroconf/PKGBUILD
+++ b/~fauno/distccd-zeroconf/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=distcc
 pkgver=3.1
 pkgrel=1
 pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/distcc/"
 license=('GPL')
 depends=('gcc' 'popt' 'avahi')
diff --git a/~fauno/minidjvu/PKGBUILD b/~fauno/minidjvu/PKGBUILD
new file mode 100644
index 000000000..664e8a3f8
--- /dev/null
+++ b/~fauno/minidjvu/PKGBUILD
@@ -0,0 +1,31 @@
+# Contributor: Orivej Desh <masecretaire@gmx.fr>
+# Maintainer: Orivej Desh <masecretaire@gmx.fr>
+pkgname=minidjvu
+pkgver=0.8
+pkgrel=2
+pkgdesc="Highly efficient DjVu encoder for black-and-white images"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://minidjvu.sourceforge.net/"
+license=('GPL')
+depends=("gcc-libs" "libtiff")
+options=("!libtool")
+source=("http://downloads.sourceforge.net/project/minidjvu/minidjvu/$pkgver/minidjvu-$pkgver.tar.gz")
+md5sums=('b354eb74d83c6e2d91aab2a6c2879ba7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --libdir=/usr/lib
+
+  sed -i -e 's#/usr/bin/gzip#/bin/gzip#' Makefile
+  sed -i -e 's#-9 \$(MANDIR)#-9 $(DESTDIR)$(MANDIR)#' Makefile
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir -p "$pkgdir"/usr/{bin,lib,share/man/man1}
+  make DESTDIR="$pkgdir/" install
+}
+
diff --git a/~lukeshu/android-udev/.gitignore b/~lukeshu/android-udev/.gitignore
new file mode 100644
index 000000000..290a3baa3
--- /dev/null
+++ b/~lukeshu/android-udev/.gitignore
@@ -0,0 +1 @@
+aur
\ No newline at end of file
diff --git a/~lukeshu/cinclude2dot/.gitignore b/~lukeshu/cinclude2dot/.gitignore
new file mode 100644
index 000000000..f326e85cb
--- /dev/null
+++ b/~lukeshu/cinclude2dot/.gitignore
@@ -0,0 +1,2 @@
+cinclude2dot
+cinclude2dot.1
diff --git a/~lukeshu/openni-unstable/PKGBUILD b/~lukeshu/openni-unstable/PKGBUILD
index 19d1575a1..ad3cf0096 100644
--- a/~lukeshu/openni-unstable/PKGBUILD
+++ b/~lukeshu/openni-unstable/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=(
     openni$_suf-core
     openni$_suf-core-samples
     openni$_suf-core-samples-source
-    
+
     openni$_suf-mono
     openni$_suf-mono-samples
     openni$_suf-mono-samples-source
@@ -85,7 +85,7 @@ abs_mono: $(ALL_MONO_PROJS)
 abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
 ' >> "Platform/${_os}/Build/Makefile"
 
-  
+
   # BUILD
   cd "Platform/${_os}/Build"
   make -j1 \
@@ -164,7 +164,7 @@ package_openni-unstable-java() {
 
   install -d "${pkgdir}/usr/lib"
   install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
+
   install -d "${pkgdir}/usr/share/openni/java"
   install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
 }
@@ -177,7 +177,7 @@ package_openni-unstable-mono() {
   conflicts=('openni-mono')
 
   cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
+
   install -d "${pkgdir}/usr/share/openni/mono"
   install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
 }
diff --git a/~mtjm/zbar/PKGBUILD b/~mtjm/zbar/PKGBUILD
index 64b47b5dc..7e21561e6 100644
--- a/~mtjm/zbar/PKGBUILD
+++ b/~mtjm/zbar/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=zbar
 pkgver=0.10
 pkgrel=1
 pkgdesc="A library for reading bar codes from various sources"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zbar.sourceforge.net/"
 license=('LGPL')
 depends=('glibc')
diff --git a/~xihh/blast/PKGBUILD b/~xihh/blast/PKGBUILD
new file mode 100644
index 000000000..22052163f
--- /dev/null
+++ b/~xihh/blast/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com>
+
+pkgname='blast'
+pkgver=2.2.25
+pkgrel=1
+pkgdesc="Basic Local Alignment Search Tool: BLAST finds regions of similarity between biological sequences"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://blast.ncbi.nlm.nih.gov/Blast.cgi?CMD=Web&PAGE_TYPE=BlastHome"
+license=('custom:Public_Domain')
+makedepends=()
+depends=()
+optdepends=()
+source=("ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/$pkgver/ncbi-blast-$pkgver+-src.tar.gz")
+md5sums=('01256b808e3af49a5087945b6a8c8293')
+
+build() {
+  cd "$srcdir/ncbi-blast-${pkgver}+-src/c++"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/ncbi-blast-${pkgver}+-src/c++"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/ncbi-blast-${pkgver}+-src/c++"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~xihh/libtre/PKGBUILD b/~xihh/libtre/PKGBUILD
new file mode 100644
index 000000000..ad111c45d
--- /dev/null
+++ b/~xihh/libtre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@stravy>
+pkgbase='libtre'
+pkgname=('libtre' 'python2-tre')
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="The free and portable approximate regex matching library."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://laurikari.net/tre/download/"
+license=('custom:BSD2')
+groups=()
+depends=()
+makedepends=('python' 'python2')
+checkdepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("http://laurikari.net/tre/tre-${pkgver}.tar.bz2")
+md5sums=('b4d3232593dadf6746f4727bdda20b41')
+noextract=()
+
+build() {
+  cd "$srcdir/tre-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/tre-$pkgver"
+  make -k check || true # some errors expected
+}
+
+package_libtre() {
+  cd "$srcdir/tre-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+package_python2-tre() {
+  depends=('libtre')
+  cd "$srcdir/tre-$pkgver/python"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/~xihh/muscle/LICENSE b/~xihh/muscle/LICENSE
new file mode 100644
index 000000000..e48f525fe
--- /dev/null
+++ b/~xihh/muscle/LICENSE
@@ -0,0 +1,10 @@
+MUSCLE is public domain software 
+
+The MUSCLE software, including object and source code and
+documentation, is hereby donated to the public domain.
+
+Disclaimer of warranty
+
+THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/~xihh/muscle/PKGBUILD b/~xihh/muscle/PKGBUILD
new file mode 100644
index 000000000..101e2e312
--- /dev/null
+++ b/~xihh/muscle/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@stravy>
+pkgname=muscle
+pkgver=3.8.31
+pkgrel=1
+epoch=
+pkgdesc="multiple sequence comparison by log-expectation"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.drive5.com/muscle/"
+license=('custom:PublicDomain')
+groups=()
+depends=()
+makedepends=('gcc-libs')
+checkdepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=(http://www.drive5.com/muscle/downloads${pkgver}/muscle${pkgver}_src.tar.gz LICENSE)
+md5sums=('f767f00fd15f0c5db944d41936779e10'
+         '57cfb6975987af93c89977f084d53b72')
+noextract=()
+
+build() {
+  cd "$srcdir/$pkgname$pkgver/src"
+  sed -i 's/ -msse2 -mfpmath=sse//' mk
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname$pkgver/src"
+  install -D -m755 muscle "$pkgdir/usr/bin/muscle"
+  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/~xihh/ugene/PKGBUILD b/~xihh/ugene/PKGBUILD
new file mode 100644
index 000000000..38cd578f6
--- /dev/null
+++ b/~xihh/ugene/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: bmpvieira <mail AT bmpvieira DOT com>
+pkgname=ugene
+pkgver=1.9.3
+pkgrel=1
+pkgdesc="A free cross-platform genome analysis suite."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://ugene.unipro.ru/"
+license=('GPL')
+depends=('qt' 'mesa')
+source=(${url}downloads/$pkgname-$pkgver.tar.gz)
+md5sums=('6ba5ff1bed47d928feb04ec15565c2b6')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  case "$CARCH" in
+    "i686")
+      qmake PREFIX=/usr -r ;;
+    "x86_64"|"mips64el")
+      qmake CONFIG+=x64 PREFIX=/usr -r ;;
+  esac
+  make release || return 1
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" install || return 1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~xihh/viennarna/PKGBUILD b/~xihh/viennarna/PKGBUILD
new file mode 100644
index 000000000..37de53d11
--- /dev/null
+++ b/~xihh/viennarna/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@stravy>
+pkgbase='viennarna'
+pkgname=('viennarna' 'python2-viennarna')
+pkgver=1.8.5
+pkgrel=1
+pkgdesc="RNA Secondary Structure Prediction and Comparison"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.tbi.univie.ac.at/RNA/"
+makedepends=('python2' 'swig')
+license=('Custom:BSD3')
+source=("setup.py"
+        "http://www.tbi.univie.ac.at/RNA/ViennaRNA-${pkgver}.tar.gz")
+md5sums=('d006ef9bb878aea6c184afa89986788e'
+         'cd70d63cc1be928a5f0973bd6c211e96')
+
+build() {
+  cd "$srcdir/ViennaRNA-$pkgver"
+  ./configure --prefix=/usr --without-forester
+  make
+}
+
+package_viennarna() {
+  cd "$srcdir/ViennaRNA-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+package_python2-viennarna() {
+  depends=('python2')
+  options=(!emptydirs)
+
+  mkdir -p "$srcdir/ViennaRNA-$pkgver/Python"
+  cp -r $srcdir/ViennaRNA-$pkgver/Perl/*.i "$srcdir/setup.py" \
+    "$srcdir/ViennaRNA-$pkgver/Python"
+
+  cd "$srcdir/ViennaRNA-$pkgver/Python"
+
+  swig -python RNA.i
+
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+
+}
diff --git a/~xihh/viennarna/setup.py b/~xihh/viennarna/setup.py
new file mode 100644
index 000000000..00ac0a28d
--- /dev/null
+++ b/~xihh/viennarna/setup.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+from distutils.core import setup, Extension
+import os
+import sys
+
+old_filename = os.path.join(os.path.curdir, "RNA.py")
+new_filename = os.path.join(os.path.curdir, "__init__.py")
+if os.path.exists(old_filename):
+    os.rename(old_filename, new_filename)
+
+extra_link_args = []
+if sys.platform != 'darwin':
+    extra_link_args.append('-s')
+
+extension = Extension("_RNA",
+                      ["RNA_wrap.c"],
+                      libraries=['RNA'],
+                      library_dirs=['lib'],
+                      extra_link_args=extra_link_args
+                      )
+
+setup(name="RNA",
+      version="1.8.5",
+      description="Vienna RNA",
+      author="Ivo Hofacker, Institute for Theoretical Chemistry, University of Vienna",
+      url="http://www.tbi.univie.ac.at/RNA/",
+      package_dir = {'vienna': os.path.curdir},
+      packages = ['vienna'],
+      ext_modules=[extension],
+      )